[network-manager-pptp/th/vpn-editor-split-bgo766623: 13/21] build: use stable libsecret-1 instead of libsecret-unstable
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-pptp/th/vpn-editor-split-bgo766623: 13/21] build: use stable libsecret-1 instead of libsecret-unstable
- Date: Wed, 18 May 2016 19:05:13 +0000 (UTC)
commit 2706fe70429d1c6c985f41654c4e4f8bcb703970
Author: Thomas Haller <thaller redhat com>
Date: Wed May 18 18:45:10 2016 +0200
build: use stable libsecret-1 instead of libsecret-unstable
auth-dialog/main.c | 2 --
configure.ac | 6 +++++-
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 5583e42..2688a15 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -26,8 +26,6 @@
#include <stdlib.h>
#include <errno.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 1fd7684..d78b8c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,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 >= 0.9.10)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]