configure: kwallet can now be disabled
authorThomas Guillem <thomas@gllm.fr>
Tue, 27 Sep 2016 07:54:23 +0000 (09:54 +0200)
committerThomas Guillem <thomas@gllm.fr>
Tue, 27 Sep 2016 07:54:23 +0000 (09:54 +0200)
configure.ac
modules/keystore/Makefile.am

index 936b1f0..671c8a1 100644 (file)
@@ -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"], [
@@ -4104,6 +4104,11 @@ dnl  libsecret
 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
index 0a2dbbd..a985350 100644 (file)
@@ -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