[network-manager-openvpn] build: prefer stable libsecret-1 over libsecret-unstable



commit 44508cf9e26f510cd5aad2888b89647eb420a385
Author: Thomas Haller <thaller redhat com>
Date:   Wed May 11 11:13:40 2016 +0200

    build: prefer stable libsecret-1 over 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 8f95a83..df06d95 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 
-#define SECRET_API_SUBJECT_TO_CHANGE
 #include <libsecret/secret.h>
 
 #include <nma-vpn-password-dialog.h>
diff --git a/configure.ac b/configure.ac
index 1e46e9b..d3ab7cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,11 @@ if test x"$with_gnome" != xno; then
        GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
 
        PKG_CHECK_MODULES(LIBNMA, libnma >= 1.2.0)
-       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_libnm_glib" != xno; then
                PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.2.0)


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