-if test x$WITH_GCONF = "xyes"; then
- PKG_CHECK_MODULES(GCONF, gconf-2.0)
- AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled])
+AC_MSG_CHECKING([whether GConf support is requested])
+AC_ARG_WITH([gconf],
+ [AS_HELP_STRING([--without-gconf],[disable the use of gconf])],
+ [],[with_gconf=check])
+AC_MSG_RESULT([$with_gconf])
+
+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
+
+AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false])
+if test "$with_gconf" = "yes" -a "$GCONFTOOL" = "false"; then
+ AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])