vlc | branch: master | Thomas Guillem <[email protected]> | Tue Sep 27 09:54:23 2016 +0200| [6373719e6dd80b6860078083b31ba5aff19e4f2f] | committer: Thomas Guillem
configure: kwallet can now be disabled > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6373719e6dd80b6860078083b31ba5aff19e4f2f --- configure.ac | 7 ++++++- modules/keystore/Makefile.am | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 936b1f0..671c8a1 100644 --- a/configure.ac +++ b/configure.ac @@ -3795,7 +3795,7 @@ AS_IF([test "${enable_qt}" != "no"], [ AM_CONDITIONAL(ENABLE_QT, [test "$enable_qt" != "no"]) dnl -dnl detect kde4-config patch (used for kde solids and kwallet). +dnl detect kde4-config patch (used for kde solids). dnl AC_ARG_VAR([KDE4_CONFIG], [kde4-config utility]) AS_IF([test "x$KDE4_CONFIG" = "x"], [ @@ -4105,6 +4105,11 @@ dnl PKG_ENABLE_MODULES_VLC([SECRET], [], [libsecret-1 >= 0.18], [use libsecret for keystore], [auto]) dnl +dnl kwallet +dnl +PKG_ENABLE_MODULES_VLC([KWALLET], [], [dbus-1 >= 1.6.0], [use kwallet for keystore], [auto]) + +dnl dnl Developers helper modules (should be hidden from configure help) dnl AC_ARG_ENABLE(devtools, [], [], [enable_devtools="no"]) diff --git a/modules/keystore/Makefile.am b/modules/keystore/Makefile.am index 0a2dbbd..a985350 100644 --- a/modules/keystore/Makefile.am +++ b/modules/keystore/Makefile.am @@ -19,10 +19,8 @@ libsecret_plugin_la_LIBADD = $(SECRET_LIBS) libkwallet_plugin_la_SOURCES = keystore/kwallet.c libkwallet_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) +libkwallet_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(keystoredir)' libkwallet_plugin_la_LIBADD = $(DBUS_LIBS) $(LIBM) -if HAVE_DBUS -keystore_LTLIBRARIES += libkwallet_plugin.la -endif libkeychain_plugin_la_SOURCES = keystore/keychain.m libkeychain_plugin_la_OBJCFLAGS = $(AM_CFLAGS) -fobjc-arc @@ -33,7 +31,9 @@ keystore_LTLIBRARIES += libkeychain_plugin.la endif keystore_LTLIBRARIES += \ - $(LTLIBsecret) + $(LTLIBsecret) \ + $(LTLIBkwallet) EXTRA_LTLIBRARIES += \ - libsecret_plugin.la + libsecret_plugin.la \ + libkwallet_plugin.la _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
