[evince] [build] Only fail on missing gnome-keyring when requested explicitly
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: svn-commits-list gnome org
- Subject: [evince] [build] Only fail on missing gnome-keyring when requested explicitly
- Date: Tue, 9 Jun 2009 06:02:03 -0400 (EDT)
commit 62f49fb645c00fd0ab52588a70cec76019e04afa
Author: Hib Eris <hib hiberis nl>
Date: Tue Jun 9 12:01:16 2009 +0200
[build] Only fail on missing gnome-keyring when requested explicitly
---
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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]