diff options
| author | Hib Eris <hib@hiberis.nl> | 2009-06-09 09:59:12 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2009-06-09 09:59:12 (GMT) |
| commit | 3bb5125d7f7ae4d6e717ce1879e21cae3c39fa8e (patch) | |
| tree | 7eb116b0f83331915b3bfb02dccc73667b2e8e66 | |
| parent | 51d4c0c6de63d78e9df04df525df35351b8bb454 (diff) | |
[build] Only fail on missing GConf when requested explicitly
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index d1f1ed7..41dd94a 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 |