From e67ce26378467c1ba0aa9e8fccf1728abfef81da Mon Sep 17 00:00:00 2001
From: Derek Foreman <derek.foreman@collabora.co.uk>
Date: Mon, 16 May 2011 12:20:26 -0400
Subject: [PATCH 1/2] Build with external wocky instead of submodule

---
 autogen.sh          |   43 ++++++++++---------------------------------
 configure.ac        |    3 ---
 lib/Makefile.am     |    2 +-
 lib/ext/Makefile.am |   23 -----------------------
 4 files changed, 11 insertions(+), 60 deletions(-)
 delete mode 100644 lib/ext/Makefile.am

diff --git a/autogen.sh b/autogen.sh
index 1de8195..5b32d48 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,39 +16,16 @@ fi
 
 autoreconf -i -f
 
-# Fetch submodules if needed
-if test ! -f lib/ext/wocky/autogen.sh -o ! -f lib/ext/telepathy-yell/autogen.sh;
-then
-  echo "+ Setting up submodules"
-  git submodule init
-fi
-git submodule update
-
-# launch Wocky's autogen.sh
-cd lib/ext/wocky
-sh autogen.sh --no-configure
-cd ../../..
-
-# launch tp-yell's autogen.sh
-cd lib/ext/telepathy-yell
-sh autogen.sh --no-configure
-cd ../../..
-
-# Honor NOCONFIGURE for compatibility with gnome-autogen.sh
-if test x"$NOCONFIGURE" = x; then
-    run_configure=true
-    for arg in $*; do
-        case $arg in
-            --no-configure)
-                run_configure=false
-                ;;
-            *)
-                ;;
-        esac
-    done
-else
-    run_configure=false
-fi
+run_configure=true
+for arg in $*; do
+    case $arg in
+        --no-configure)
+            run_configure=false
+            ;;
+        *)
+            ;;
+    esac
+done
 
 if test $run_configure = true; then
     ./configure "$@"
diff --git a/configure.ac b/configure.ac
index 57d6f84..d7231b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -330,13 +330,11 @@ ac_configure_args=$prev_ac_configure_args
 
 dnl Check for Wocky
 # re-enable once Wocky has been released as a lib
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"lib/ext/wocky/wocky
 PKG_CHECK_MODULES(WOCKY, wocky >= 0.0.0)
 AC_SUBST(WOCKY_CFLAGS)
 AC_SUBST(WOCKY_LIBS)
 
 dnl Check for tp-yell
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"lib/ext/telepathy-yell/telepathy-yell
 PKG_CHECK_MODULES(TP_YELL, telepathy-yell)
 AC_SUBST(TP_YELL_CFLAGS)
 AC_SUBST(TP_YELL_LIBS)
@@ -377,7 +375,6 @@ AC_OUTPUT( Makefile \
            tests/suppressions/Makefile \
            tests/twisted/Makefile \
            lib/Makefile \
-           lib/ext/Makefile \
            lib/gibber/Makefile \
            lib/loudmouth/Makefile \
            plugins/Makefile \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 620e572..8dc3fdb 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1 +1 @@
-SUBDIRS=ext gibber loudmouth
+SUBDIRS=gibber loudmouth
diff --git a/lib/ext/Makefile.am b/lib/ext/Makefile.am
deleted file mode 100644
index ecb0d90..0000000
--- a/lib/ext/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-SUBDIRS =
-DIST_SUBDIRS = wocky telepathy-yell
-
-all-local:
-	@cd wocky && $(MAKE)
-	@cd telepathy-yell && $(MAKE)
-
-clean-local:
-	if test -e wocky/Makefile ; then \
-		cd wocky && $(MAKE) clean ; \
-	fi
-
-	if test -e telepathy-yell/Makefile ; then \
-		cd telepathy-yell && $(MAKE) clean ; \
-	fi
-
-uninstall-local:
-	@cd wocky/wocky && $(MAKE) uninstall
-	@cd telepathy-yell/telepathy-yell && $(MAKE) uninstall
-
-install-data-local:
-	@cd wocky/wocky && $(MAKE) install
-	@cd telepathy-yell/telepathy-yell && $(MAKE) install
-- 
1.7.7