[telepathy-gabble/master] configure Wocky before checking for the lib so wocky-uninstalled.pc has been generated

[Guillaume Desmottes]

---
 configure.ac |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3219be7..9b3de6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,6 +174,16 @@ AC_MSG_RESULT([$TEST_PYTHON])
 AC_SUBST(TEST_PYTHON)
 AM_CONDITIONAL([WANT_TWISTED_TESTS], test false != "$TEST_PYTHON")
 
+# Always build Wocky with GTK doc support as we need it when doing "make check"
+# We have to run Wocky's configure *before* looking for it with PKG_CHECK_MODULES so wocky-uninstalled.pc has been generated
+echo "== Configuring embedded Wocky instance =="
+origdir=`pwd`
+
+cd "$top_srcdir"lib/ext/wocky &&
+  ./configure --enable-gtk-doc ||
+  AC_MSG_ERROR([Failed to configure embedded Wocky tree])
+cd "$origdir"
+
 dnl Check for Wocky
 # re-enable once Wocky has been released as a lib
 export PKG_CONFIG_PATH=lib/ext/wocky/wocky:$PKG_CONFIG_PATH
@@ -181,17 +191,6 @@ PKG_CHECK_MODULES(WOCKY, wocky >= 0.0.0)
 AC_SUBST(WOCKY_CFLAGS)
 AC_SUBST(WOCKY_LIBS)
 
-# Always build Wocky with GTK doc support as we need it when doing "make check"
-AC_CONFIG_COMMANDS([configure-embedded-wocky],
-  [echo "== Configuring embedded Wocky instance =="
-  origdir=`pwd`
-
-  cd "$top_srcdir"lib/ext/wocky &&
-         ./configure --enable-gtk-doc ||
-         AC_MSG_ERROR([Failed to configure embedded Wocky tree])
-     cd "$origdir"
- ])
-
 dnl Check for libsoup
 PKG_CHECK_MODULES(SOUP, libsoup-2.4)
 AC_SUBST(SOUP_CFLAGS)
-- 
1.5.6.5