[network-manager-openconnect: 8/15] build: use stable libsecret-1 instead of libsecret-unstable



commit 34a1b839a195c08f512bf9927c4badf923abc46f
Author: Thomas Haller <thaller redhat com>
Date:   Tue Jun 14 23:01:09 2016 +0200

    build: use stable libsecret-1 instead of libsecret-unstable

 auth-dialog/main.c |    1 -
 configure.ac       |    6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index a03aae8..1f9564b 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -37,7 +37,6 @@
 #include <gtk/gtk.h>
 #include <glib-unix.h>
 
-#define SECRET_API_SUBJECT_TO_CHANGE
 #include <libsecret/secret.h>
 
 #include "openconnect.h"
diff --git a/configure.ac b/configure.ac
index 56f23f6..ff1b897 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,11 @@ if test x"$with_gnome" != xno; then
        PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
        GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
 
-       PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
+       PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18, [], [
+               dnl We use the secret service API that went stable in 0.18
+               PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
+               LIBSECRET_CFLAGS="$LIBSECRET_CFLAGS -DSECRET_API_SUBJECT_TO_CHANGE"
+       ])
 
        if test x"$with_authdlg" != xno; then
                PKG_CHECK_MODULES(OPENCONNECT, openconnect >= 3.02)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]