Configure support for libsecret

[moonshot-ui.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b71fac0..55cf276 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.63])
 AC_INIT([Moonshot-ui],
-        [1.0.0],
+        [1.0.5],
         [moonshot-community@jiscmail.ac.uk],
         [moonshot-ui],
         [http://www.project-moonshot.org/])
@@ -12,6 +12,7 @@ AC_CONFIG_HEADERS([config.h])
 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])
@@ -61,6 +62,17 @@ case "$host" in
     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
@@ -88,6 +100,20 @@ PKG_CHECK_MODULES([GTK],
 AC_SUBST(GTK_VERSION)
 
 
+# For all platforms: If Log4Vala is enabled, then Use Log4Vala 0.2 if available; else revert to 0.1
+if [test x$log4vala = xtrue]; then
+PKG_CHECK_MODULES([LOG4VALA],
+        [log4vala-0.2],
+        [LOG4VALA_VERSION="log4vala-0.2"],
+            [PKG_CHECK_MODULES([LOG4VALA],
+                        [log4vala-0.1],
+                        [LOG4VALA_VERSION="log4vala-0.1"]
+            )]                            
+)
+AC_SUBST(LOG4VALA_VERSION)
+fi
+
+
 # For all platforms: Use gee-0.8 if available; else revert to gee-1.0
 # (yes, gee-0.8 is an upgrade from gee-1.0!)
 PKG_CHECK_MODULES([LIB_GEE],