[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pidgin-commits
Subject:    /pidgin/main: 20a8d238153c: configure.ac: Make Secret Service co...
From:       Mike Ruprecht <cmaiku () gmail ! com>
Date:       2016-10-19 18:50:57
Message-ID: hg.20a8d238153c.1476903057.-874508059 () rock ! pidgin ! im
[Download RAW message or body]

Changeset: 20a8d238153c4cc42ec91a37654503b73f20d5f4
Author:	 Mike Ruprecht <cmaiku@gmail.com>
Date:	 2016-09-21 12:37 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/20a8d238153c

Description:

configure.ac: Make Secret Service config work like Gnome Keyring

This patch updates the libsecret/Secret Service checks to behave
like Gnome Keyring's. It doesn't try to be enabled by default on
Windows and wants to be explicitly disabled if forcing dependencies.

diffstat:

 configure.ac |  14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diffs (31 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1538,14 +1538,26 @@ dnl ####################################
 dnl # Check for Secret Service headers
 dnl #######################################################################
 
-AC_ARG_ENABLE(libsecret, [AC_HELP_STRING([--disable-libsecret], [enable Secret \
Service support])], enable_secret_service=no, enable_secret_service=yes) \
+AC_ARG_ENABLE(libsecret, +	[AC_HELP_STRING([--disable-libsecret], [enable Secret \
Service support])], +	enable_secret_service="$enableval", \
enable_secret_service="$is_not_win32")  
 if test "x$enable_secret_service" = "xyes" ; then
 	PKG_CHECK_MODULES(SECRETSERVICE, [libsecret-1], [
 		AC_SUBST(SECRETSERVICE_CFLAGS)
 		AC_SUBST(SECRETSERVICE_LIBS)
 		AC_DEFINE(HAVE_SECRETSERVICE, 1, [Define if we have Secret Service.])
+	], [
+		AC_MSG_RESULT(no)
+		enable_secret_service="no"
+		if test "x$force_deps" = "xyes" ; then
+			AC_MSG_ERROR([
+Libsecret development headers not found
+Use --disable-libsecret if you do not need it.
+])
+		fi
 	])
+
 fi
 
 AM_CONDITIONAL(ENABLE_SECRETSERVICE, test "x$enable_secret_service" = "xyes")

_______________________________________________
Commits mailing list
Commits@pidgin.im
https://pidgin.im/cgi-bin/mailman/listinfo/commits


[prev in list] [next in list] [prev in thread] [next in thread]