[PATCH] configure.ac: change the grilo pkg-config if uninstalled

[Víctor Manuel Jáquez Leal <vjaquez igalia com>]

If compiling with the --enable-uninstalled flag, the pkg-config
machinery will lookup for grilo-uninstalled.pc instead of the
normal grilo-X.Y.pc, so, if you want to compile the plugins with
an uninstalled core, you should enable this flag beside changing
you PKG_CONFIG_PATH environment variable.

Session example:

export PKG_CONFIG_PATH=/home/user/grilo/
./autogen.sh --enable-uninstalled
make
---
 configure.ac |   70 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/configure.ac b/configure.ac
index 174d859..8e02813 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,12 +39,49 @@ CFLAGS+=" ${WARN_CFLAGS} -Wmissing-declarations -std=c99 "
 GNOME_MAINTAINER_MODE_DEFINES
 
 # ----------------------------------------------------------
-# DEFINITIONS
+# UNINSTALLED SUPPORT
 # ----------------------------------------------------------
 
-GRL_VERSION=0.1
+AC_ARG_ENABLE(uninstalled,
+        AC_HELP_STRING([--enable-uninstalled],
+                [run uninstalled (default: no)]),,
+        [enable_uninstalled=no])
+
+if test "x$enable_uninstalled" = "xyes"; then
+        AC_MSG_WARN("Configuring for running uninstalled!")
+	GRL_VERSION=uninstalled
+else
+	GRL_VERSION=0.1
+fi
+
 GRL_NAME=grilo-${GRL_VERSION}
 
+# ----------------------------------------------------------
+# DEBUG SUPPORT
+# ----------------------------------------------------------
+
+AC_ARG_ENABLE(debug,
+        AC_HELP_STRING([--enable-debug],
+                [include debug symbols (default: no)]),,
+        [enable_debug=no])
+
+if test "x$enable_debug" = "xyes"; then
+	CFLAGS="$CFLAGS -g3 -O0"
+fi
+
+# ----------------------------------------------------------
+# HARD DEPENDENCIES
+# ----------------------------------------------------------
+
+PKG_CHECK_MODULES([DEPS], glib-2.0 \
+			  gobject-2.0 \
+			  gmodule-2.0 \
+			  ${GRL_NAME} = 0.1.5)
+
+# ----------------------------------------------------------
+# DEFINITIONS
+# ----------------------------------------------------------
+
 # Plugins directory
 
 GRL_PLUGINS_DIR=`pkg-config --variable=plugindir ${GRL_NAME}`
@@ -57,14 +94,9 @@ GRL_PLUGINS_CONF_DIR="${datadir}/${GRL_NAME}/plugins"
 AC_SUBST(GRL_PLUGINS_CONF_DIR)
 
 # ----------------------------------------------------------
-# DEPENDENCIES
+# EXTERNAL/OPTIONAL DEPENDENCIES
 # ----------------------------------------------------------
 
-PKG_CHECK_MODULES(DEPS, glib-2.0 \
-			gobject-2.0 \
-			gmodule-2.0 \
-			grilo-0.1 >= 0.1.5)
-
 PKG_CHECK_MODULES(XML, libxml-2.0, HAVE_XML=yes, HAVE_XML=no)
 
 PKG_CHECK_MODULES(GIO, gio-2.0, HAVE_GIO=yes, HAVE_GIO=no)
@@ -112,28 +144,6 @@ if test "x$HAVE_GDATA" = "xyes"; then
 fi
 
 # ----------------------------------------------------------
-# UNINSTALLED SUPPORT
-# ----------------------------------------------------------
-
-AC_ARG_ENABLE(uninstalled,
-        AC_HELP_STRING([--enable-uninstalled],
-                [run uninstalled (default: no)]),,
-        [enable_uninstalled=no])
-
-# ----------------------------------------------------------
-# DEBUG SUPPORT
-# ----------------------------------------------------------
-
-AC_ARG_ENABLE(debug,
-        AC_HELP_STRING([--enable-debug],
-                [include debug symbols (default: no)]),,
-        [enable_debug=no])
-
-if test "x$enable_debug" = "xyes"; then
-	CFLAGS="$CFLAGS -g3 -O0"
-fi
-
-# ----------------------------------------------------------
 # BUILD FAKE METADATA PLUGIN
 # ----------------------------------------------------------
 
-- 
1.7.1