[grilo] build: check hard pkg-config dependencies first

[Victor Manuel Jaquez Leal <vjaquez src gnome org>]

commit 377860ad5c1800b9ae85cdd28c58a49922cf6574
Author: Víctor Manuel Jáquez Leal <vjaquez igalia com>
Date:   Sat Sep 4 12:19:58 2010 +0200

    build: check hard pkg-config dependencies first
    
    As reported by Damien Lespiau <damien lespiau intel com>:
    
    """
    PKG_CHECK_MODULES requires PKG_PROG_PKG_CONFIG, see pkg.m4:
    
        AC_DEFUN([PKG_CHECK_MODULES],
        [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
    
    The expansion of the AC_REQUIRE is done only once, the first time m4
    encounters PKG_CHECK_MODULES.
    
    Now the real issue is that the first occurrence of PKG_CHECK_MODULES is
    in the test:
        if test "x$enable_vala" != no;
    
    which means PKG_PROG_PKG_CONFIG is not being executed when --disable-vala
    is given on the command line and thus I have the following error at
    configure time.
    """
    
    Then, this patch makes check first the hard dependencies, and aftwards the
    optional stuff.
    
    Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez igalia com>

 configure.ac |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a8207b5..0b3416f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,6 +81,25 @@ GRL_PLUGINS_CONF_DIR="${datadir}/${GRL_NAME}/plugins"
 AC_SUBST(GRL_PLUGINS_CONF_DIR)
 
 # ----------------------------------------------------------
+# DEPENDENCIES
+# ----------------------------------------------------------
+
+PKG_CHECK_MODULES(DEPS, glib-2.0 \
+			gobject-2.0 \
+			gmodule-2.0 \
+			gio-2.0 \
+			libxml-2.0)
+
+# Tools
+
+PKG_CHECK_MODULES(GTU, gtk+-2.0 \
+                       gconf-2.0,
+                       BUILD_GRILO_TEST_UI=yes,
+                       BUILD_GRILO_TEST_UI=no)
+
+AM_CONDITIONAL(BUILD_GRILO_TEST_UI, test "x$BUILD_GRILO_TEST_UI" = "xyes")
+
+# ----------------------------------------------------------
 # UNINSTALLED SUPPORT
 # ----------------------------------------------------------
 
@@ -166,25 +185,6 @@ GOBJECT_INTROSPECTION_CHECK([0.6.7])
 #AM_GLIB_GNU_GETTEXT
 
 # ----------------------------------------------------------
-# DEPENDENCIES
-# ----------------------------------------------------------
-
-PKG_CHECK_MODULES(DEPS, glib-2.0 \
-			gobject-2.0 \
-			gmodule-2.0 \
-                        gio-2.0 \
-			libxml-2.0)
-
-# Tools
-
-PKG_CHECK_MODULES(GTU, gtk+-2.0 \
-                       gconf-2.0,
-                       BUILD_GRILO_TEST_UI=yes,
-                       BUILD_GRILO_TEST_UI=no)
-
-AM_CONDITIONAL(BUILD_GRILO_TEST_UI, test "x$BUILD_GRILO_TEST_UI" = "xyes")
-
-# ----------------------------------------------------------
 # WORKAROUNDS
 # ----------------------------------------------------------