From: Hib Eris <hib@hiberis.nl>
Date: Tue, 9 Jun 2009 09:59:12 +0000 (+0200)
Subject: [build] Only fail on missing GConf when requested explicitly
X-Git-Tag: EVINCE_2_27_3~42
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=3bb5125d7f7ae4d6e717ce1879e21cae3c39fa8e;p=evince.git

[build] Only fail on missing GConf when requested explicitly
---

diff --git a/configure.ac b/configure.ac
index d1f1ed7e..41dd94a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,15 +196,24 @@ dnl ========= Check for GConf
 AC_MSG_CHECKING([whether GConf support is requested])
 AC_ARG_WITH([gconf],
   [AS_HELP_STRING([--without-gconf],[disable the use of gconf])],
-  [],[with_gconf=yes])
+  [],[with_gconf=check])
 AC_MSG_RESULT([$with_gconf])
 
-AM_CONDITIONAL([WITH_GCONF],[test "$with_gconf" = "yes"])
-
-if test "$with_gconf" = "yes"; then
-   PKG_CHECK_MODULES([GCONF],[gconf-2.0])
-   AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled])
+if test "x$with_gconf" != "xno"; then
+	PKG_CHECK_MODULES([GCONF],[gconf-2.0],
+		with_gconf=yes,
+		if test "x$with_gconf" = "xcheck"; then
+			with_gconf=no
+			AC_MSG_WARN(The use of GConf is disabled since required library gconf-2.0 was not found.)
+		else
+			AC_MSG_FAILURE(GConf test failed: $GCONF_PKG_ERRORS)
+		fi
+	)
 fi
+if test "x$with_gconf" = "xyes"; then
+	AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled])
+fi
+AM_CONDITIONAL([WITH_GCONF],[test "$with_gconf" = "yes"])
 
 AM_GCONF_SOURCE_2