src/moonshot-local-flat-file-store.vala \
src/moonshot-keyring-store-base.vala \
src/moonshot-keyring-store-gnome.vala \
+ src/moonshot-keyring-store-secret.vala \
src/moonshot-idcard-store.vala \
src/moonshot-id.vala \
src/moonshot-identity-dialog.vala \
if OS_LINUX
-AM_CPPFLAGS += -I/usr/include/gnome-keyring-1
-AM_VALAFLAGS += --pkg moonshot-gnome-keyring --define=GNOME_KEYRING
-src_moonshot_LDFLAGS += -lgnome-keyring -lcrypto
-src_moonshot_webp_LDFLAGS += -lgnome-keyring -lcrypto
+AM_CPPFLAGS += $(KEYRING_CFLAGS)
+AM_VALAFLAGS += $(KEYRING_VALAFLAGS)
+src_moonshot_LDADD += $(KEYRING_LIBS) -lcrypto
+src_moonshot_webp_LDFLAGS += $(KEYRING_LIBS) -lcrypto
## Installing mime type data
mimedir = $(datadir)/mime/packages
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
+AC_SUBST([KEYRING_VALAFLAGS],[])
AM_INIT_AUTOMAKE([1.11 -Wall foreign subdir-objects tar-pax no-dist-gzip dist-xz])
AM_SILENT_RULES([yes])
win32=no
linux=yes
+ PKG_CHECK_MODULES([KEYRING],
+ [libsecret-1],
+ [KEYRING_VALAFLAGS=" --pkg libsecret-1 --define LIBSECRET_KEYRING"],
+ [
+ PKG_CHECK_MODULES([KEYRING], [gnome-keyring-1],
+ [KEYRING_VALAFLAGS="--pkg moonshot-gnome-keyring --define GNOME_KEYRING"],
+ [AC_ERROR(["Neither gnome-keyring not libsecret is found])
+ ])
+ ])
+
+
# We require dbus-glib for the client library even if we are using GDBus
# in the server. The reason we can't always use dbus-glib in the server is
# because Vala drops support for it, but as it ships with DBus there is very