diff options
| author | Hib Eris <hib@hiberis.nl> | 2009-06-09 10:01:16 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2009-06-09 10:01:16 (GMT) |
| commit | 62f49fb645c00fd0ab52588a70cec76019e04afa (patch) | |
| tree | a2c98f78c9be9b2cc7ed992aa8d9af1f6dbe3244 /configure.ac | |
| parent | 3bb5125d7f7ae4d6e717ce1879e21cae3c39fa8e (diff) | |
[build] Only fail on missing gnome-keyring when requested explicitly
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 41dd94a..ca89c27 100644 --- a/configure.ac +++ b/configure.ac @@ -151,13 +151,23 @@ AC_ARG_WITH(keyring, 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) |