Commit 6373719e authored by Thomas Guillem's avatar Thomas Guillem

configure: kwallet can now be disabled

parent 57731a60
...@@ -3795,7 +3795,7 @@ AS_IF([test "${enable_qt}" != "no"], [ ...@@ -3795,7 +3795,7 @@ AS_IF([test "${enable_qt}" != "no"], [
AM_CONDITIONAL(ENABLE_QT, [test "$enable_qt" != "no"]) AM_CONDITIONAL(ENABLE_QT, [test "$enable_qt" != "no"])
dnl dnl
dnl detect kde4-config patch (used for kde solids and kwallet). dnl detect kde4-config patch (used for kde solids).
dnl dnl
AC_ARG_VAR([KDE4_CONFIG], [kde4-config utility]) AC_ARG_VAR([KDE4_CONFIG], [kde4-config utility])
AS_IF([test "x$KDE4_CONFIG" = "x"], [ AS_IF([test "x$KDE4_CONFIG" = "x"], [
...@@ -4104,6 +4104,11 @@ dnl libsecret ...@@ -4104,6 +4104,11 @@ dnl libsecret
dnl dnl
PKG_ENABLE_MODULES_VLC([SECRET], [], [libsecret-1 >= 0.18], [use libsecret for keystore], [auto]) 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
dnl Developers helper modules (should be hidden from configure help) dnl Developers helper modules (should be hidden from configure help)
dnl dnl
......
...@@ -19,10 +19,8 @@ libsecret_plugin_la_LIBADD = $(SECRET_LIBS) ...@@ -19,10 +19,8 @@ libsecret_plugin_la_LIBADD = $(SECRET_LIBS)
libkwallet_plugin_la_SOURCES = keystore/kwallet.c libkwallet_plugin_la_SOURCES = keystore/kwallet.c
libkwallet_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) libkwallet_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
libkwallet_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(keystoredir)'
libkwallet_plugin_la_LIBADD = $(DBUS_LIBS) $(LIBM) 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_SOURCES = keystore/keychain.m
libkeychain_plugin_la_OBJCFLAGS = $(AM_CFLAGS) -fobjc-arc libkeychain_plugin_la_OBJCFLAGS = $(AM_CFLAGS) -fobjc-arc
...@@ -33,7 +31,9 @@ keystore_LTLIBRARIES += libkeychain_plugin.la ...@@ -33,7 +31,9 @@ keystore_LTLIBRARIES += libkeychain_plugin.la
endif endif
keystore_LTLIBRARIES += \ keystore_LTLIBRARIES += \
$(LTLIBsecret) $(LTLIBsecret) \
$(LTLIBkwallet)
EXTRA_LTLIBRARIES += \ EXTRA_LTLIBRARIES += \
libsecret_plugin.la libsecret_plugin.la \
libkwallet_plugin.la
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment