[network-manager-fortisslvpn/th/gtk-split-and-log-bgo771544: 7/26] build: use stable libsecret-1 instead of libsecret-unstable

[Thomas Haller <thaller src gnome org>]

commit 0d0a423894c374e703b0b8c0512495eec868c12d
Author: Thomas Haller <thaller redhat com>
Date:   Thu Sep 15 10:45:55 2016 +0200

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

 auth-dialog/main.c |    3 ---
 configure.ac       |    6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 33c6087..38399a3 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -28,9 +28,6 @@
 #include <errno.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-
-
-#define SECRET_API_SUBJECT_TO_CHANGE
 #include <libsecret/secret.h>
 
 #include <NetworkManager.h>
diff --git a/configure.ac b/configure.ac
index 533bfd6..6ccfcbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,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.1.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.0.4)