summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in17
2 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b4bc1c9a..768abb0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-06 Tristan Van Berkom <tvb@gnome.org>
+
+ * configure.in: Check for --disable-gnome arg.
+
2006-07-05 Juan Pablo Ugarte <juanpablougarte@gmail.com>
* src/glade-builtins.[ch]: fixed bug 343712
diff --git a/configure.in b/configure.in
index 0fae1c80..904289fe 100644
--- a/configure.in
+++ b/configure.in
@@ -62,10 +62,19 @@ AC_SUBST(GTK_CFLAGS)
dnl ================================================================
dnl Check for optional gnome libs
dnl ================================================================
-PKG_CHECK_MODULES(GNOME, libbonoboui-2.0 libgnomeui-2.0,
- [have_gnome=yes],[have_gnome=no])
-AC_SUBST(GNOME_LIBS)
-AC_SUBST(GNOME_CFLAGS)
+AC_ARG_ENABLE(gnome,
+[ --disable-gnome disable gnome catalog],
+ check_gnome=$enableval, check_gnome=yes)
+
+if test x"$check_gnome" = x"yes"; then
+ PKG_CHECK_MODULES(GNOME, libbonoboui-2.0 libgnomeui-2.0,
+ [have_gnome=yes],[have_gnome=no])
+ AC_SUBST(GNOME_LIBS)
+ AC_SUBST(GNOME_CFLAGS)
+else
+ have_gnome=no
+fi
+
AM_CONDITIONAL(BUILD_GNOME, test x"$have_gnome" = "xyes")
dnl ================================================================