pidgin/pidgin

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

2016-09-21, Mike Ruprecht
20a8d238153c
Parents 2db097f95f6a
Children 8be2e7b22d1e
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.
1 files changed, 13 insertions(+), 1 deletions(-)
  • +13 -1
    configure.ac
    • --- a/configure.ac Wed Sep 14 14:07:08 2016 -0500
    +++ b/configure.ac Wed Sep 21 12:37:19 2016 -0500
    @@ -1538,14 +1538,26 @@
    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")