no) WITH_KEYRING=no ;;
*) AC_MSG_ERROR(bad value ${withval} for --with-keyring) ;;
esac],
- [WITH_KEYRING=yes]) dnl Default value
-AM_CONDITIONAL(WITH_KEYRING, test x$WITH_KEYRING = "xyes")
-
+ [WITH_KEYRING=check]) dnl Default value
+
+if test x$WITH_KEYRING != "xno"; then
+ PKG_CHECK_MODULES(KEYRING, gnome-keyring-1 >= $KEYRING_REQUIRED,
+ WITH_KEYRING=yes,
+ if test "x$WITH_KEYRING" = "xcheck"; then
+ WITH_KEYRING=no
+ AC_MSG_WARN(The use of gnome-keyring is disabled since required library gnome-keyring-1 >= $KEYRING_REQUIRED was not found.)
+ else
+ AC_MSG_FAILURE(Gnome-keyring test failed: $KEYRING_PKG_ERRORS)
+ fi
+ )
+fi
if test x$WITH_KEYRING = "xyes"; then
- PKG_CHECK_MODULES(KEYRING, gnome-keyring-1 >= $KEYRING_REQUIRED)
AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled])
fi
+AM_CONDITIONAL(WITH_KEYRING, test x$WITH_KEYRING = "xyes")
GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)
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