[network-manager-pptp/th/vpn-editor-split-bgo766623: 14/21] build: bump required libnm and NetworkManager version



commit 312b5fcddebf19f59299b5d20c91d45d533a1408
Author: Thomas Haller <thaller redhat com>
Date:   Wed May 18 18:47:19 2016 +0200

    build: bump required libnm and NetworkManager version

 configure.ac |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d78b8c7..816848b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ 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(LIBNMA, libnma >= 1.1.0)
+       PKG_CHECK_MODULES(LIBNMA, libnma >= 1.2.0)
        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)
@@ -83,15 +83,18 @@ if test x"$with_gnome" != xno; then
        ])
 
        if test x"$with_libnm_glib" != xno; then
-               PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 0.9.10)
+               PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.2.0)
                PKG_CHECK_MODULES(LIBNM_GLIB,
-                                 NetworkManager >= 1.1.0
-                                 libnm-glib >= 1.1.0
-                                 libnm-glib-vpn >= 1.1.0)
+                                 NetworkManager >= 1.2.0
+                                 libnm-util >= 1.2.0
+                                 libnm-glib >= 1.2.0
+                                 libnm-glib-vpn >= 1.2.0)
+               LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
+               LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
        fi
 fi
 
-PKG_CHECK_MODULES(LIBNM, libnm >= 1.1.0)
+PKG_CHECK_MODULES(LIBNM, libnm >= 1.2.0)
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
 


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