pidgin/pidgin

libsecret-keyring: Enable libsecret keyring plugin

2016-09-14, Mike Ruprecht
4d812213b260
Parents 5a63c26f21fd
Children d4cd494a36a5
libsecret-keyring: Enable libsecret keyring plugin
2 files changed, 10 insertions(+), 14 deletions(-)
  • +10 -12
    configure.ac
  • +0 -2
    libpurple/plugins/keyrings/secretservice.c
    • --- a/configure.ac Wed Sep 14 14:53:12 2016 -0500
    +++ b/configure.ac Wed Sep 14 13:00:13 2016 -0500
    @@ -1538,19 +1538,17 @@
    dnl # Check for Secret Service headers
    dnl #######################################################################
    -# disabled - see secretservice.c
    -#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=no, enable_secret_service=yes)
    -#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.])
    -# ])
    -#fi
    +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.])
    + ])
    +fi
    -#AM_CONDITIONAL(ENABLE_SECRETSERVICE, test "x$enable_secret_service" = "xyes")
    -AM_CONDITIONAL(ENABLE_SECRETSERVICE, test "x1" = "x2")
    +AM_CONDITIONAL(ENABLE_SECRETSERVICE, test "x$enable_secret_service" = "xyes")
    dnl #######################################################################
    dnl # Check for GNOME Keyring headers
    @@ -2272,7 +2270,7 @@
    echo
    echo Build with GNOME Keyring...... : $enable_gnome_keyring
    echo Build with KWallet............ : $enable_kwallet
    -#echo Build with Secret Service..... : $enable_secret_service
    +echo Build with Secret Service..... : $enable_secret_service
    echo
    echo Build with plugin support..... : $enable_plugins
    echo Enable Introspection...........: $enable_introspection
    --- a/libpurple/plugins/keyrings/secretservice.c Wed Sep 14 14:53:12 2016 -0500
    +++ b/libpurple/plugins/keyrings/secretservice.c Wed Sep 14 13:00:13 2016 -0500
    @@ -21,8 +21,6 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#error "This keyring needs some more work (see TODO)"
    -
    /* TODO
    *
    * This keyring needs some more work, so it will be disabled until its quality