[gitg] Fix glade detection

[Ignacio Casal Quinteiro <icq src gnome org>]

commit f5da48b42cbe03bea19a46ab4fcf977dd3456429
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Mar 27 17:53:52 2011 +0200

    Fix glade detection

 configure.ac |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 34bcf74..d84135a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,21 +148,18 @@ GLADE_UI_REQUIRED=3.2
 
 AC_ARG_ENABLE([glade-catalog],
               [AS_HELP_STRING([--enable-glade-catalog[=@<:@no/auto/yes@:>@]],
-                              [Install a glade catalog file [default=auto]])],
+                              [Install a glade catalog file [default=no]])],
                               [glade_catalog=$enableval],
                               [glade_catalog="no"])
 
-if test "x$glade_catalog" = "xauto"; then
-	PKG_CHECK_EXISTS([gladeui-1.0 >= $GLADE_UI_REQUIRED], \
-	                 glade_catalog="yes", glade_catalog="no")
-fi
-
-AM_CONDITIONAL([GLADE_CATALOG], [test "x$glade_catalog" = xyes])
+AM_CONDITIONAL([GLADE_CATALOG], [ test "$glade_catalog" = "yes" ])
 
-AS_IF([test "x$glade_catalog" = xyes],
-	[PKG_CHECK_MODULES(GLADE, [gladeui-1.0 >= $GLADE_UI_REQUIRED])
-	 GLADE_CATALOGDIR=`$PKG_CONFIG --variable=catalogdir gladeui-1.0 2>&AS_MESSAGE_LOG_FD`
-	 AC_SUBST(GLADE_CATALOGDIR)])
+AS_IF([ test "$glade_catalog" = "yes" ],
+	[PKG_CHECK_EXISTS(GLADE, [gladeui-2.0 >= $GLADE_UI_REQUIRED])
+	 AC_MSG_CHECKING([for Glade catalog dir])
+	 GLADE_CATALOG_DIR=`$PKG_CONFIG --variable=catalogdir gladeui-2.0 2>&AS_MESSAGE_LOG_FD`
+	 AC_MSG_RESULT([$GLADE_CATALOG_DIR])
+	 AC_SUBST(GLADE_CATALOG_DIR)])
 
 AC_CONFIG_FILES([
 Makefile