From 0fa986336307de3d8e21739ad849d3fd675763a7 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Wed, 21 Oct 2015 10:56:23 +0200
Subject: [PATCH] nm: Check for libnm

libnm replaces libnm-glib. This will make sense with port to libnm and is done
to reduce line noise in that commit.
---
 src/frontends/gnome/auth-dialog/Makefile.am |  5 ++---
 src/frontends/gnome/configure.ac            | 10 ++++++----
 src/frontends/gnome/debian/control          |  1 +
 src/frontends/gnome/properties/Makefile.am  |  8 ++++----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/frontends/gnome/auth-dialog/Makefile.am b/src/frontends/gnome/auth-dialog/Makefile.am
index 9c9f7d6a0..ddfd7eebc 100644
--- a/src/frontends/gnome/auth-dialog/Makefile.am
+++ b/src/frontends/gnome/auth-dialog/Makefile.am
@@ -4,8 +4,7 @@ nm_strongswan_auth_dialog_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(LIBGNOMEUI_CFLAGS) \
 	$(LIBSECRET_CFLAGS) \
-	$(NETWORK_MANAGER_CFLAGS) \
-	$(NM_UTILS_CFLAGS) \
+	$(LIBNM_GLIB_CFLAGS) \
 	-DG_DISABLE_DEPRECATED \
 	-DGNOME_DISABLE_DEPRECATED \
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
@@ -18,4 +17,4 @@ nm_strongswan_auth_dialog_LDADD = \
 	$(GTK_LIBS) \
 	$(LIBGNOMEUI_LIBS) \
 	$(LIBSECRET_LIBS) \
-	$(NM_UTILS_LIBS)
+	$(LIBNM_GLIB_LIBS)
diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac
index a2e3beef3..41cd56069 100644
--- a/src/frontends/gnome/configure.ac
+++ b/src/frontends/gnome/configure.ac
@@ -46,10 +46,12 @@ AM_GLIB_GNU_GETTEXT
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
 PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
 PKG_CHECK_MODULES(LIBSECRET, libsecret-1)
-PKG_CHECK_EXISTS([libnm-glib],
-	[PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.9.0 libnm-util libnm-glib libnm-glib-vpn)],
-	[PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.9.0 libnm-util libnm_glib libnm_glib_vpn)]
-)
+
+PKG_CHECK_MODULES(LIBNM_GLIB, NetworkManager >= 0.9.0 libnm-util libnm-glib libnm-glib-vpn)
+
+PKG_CHECK_MODULES(LIBNM, libnm >= 1.1.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"
 
 AC_ARG_WITH(
 	[charon],
diff --git a/src/frontends/gnome/debian/control b/src/frontends/gnome/debian/control
index be60bcf14..c35bdf683 100644
--- a/src/frontends/gnome/debian/control
+++ b/src/frontends/gnome/debian/control
@@ -4,6 +4,7 @@ Priority: extra
 Maintainer: Martin Willi <martin@strongswan.org>
 Build-Depends: cdbs,
 	debhelper (>= 7),
+	libnm (>= 1.1.0),
 	network-manager-dev (>= 0.9),
 	libnm-util-dev (>= 0.9),
 	libnm-glib-dev (>= 0.9),
diff --git a/src/frontends/gnome/properties/Makefile.am b/src/frontends/gnome/properties/Makefile.am
index f98ce73b8..fe62f9e00 100644
--- a/src/frontends/gnome/properties/Makefile.am
+++ b/src/frontends/gnome/properties/Makefile.am
@@ -18,21 +18,21 @@ common_CFLAGS = \
 	-DGDK_DISABLE_DEPRECATED
 
 libnm_vpn_plugin_strongswan_la_CFLAGS = \
-	$(NM_UTILS_CFLAGS) \
+	$(LIBNM_GLIB_CFLAGS) \
 	$(common_CFLAGS)
 
 libnm_strongswan_properties_la_CFLAGS = \
 	-DNM_STRONGSWAN_OLD \
-	$(NM_UTILS_CFLAGS) \
+	$(LIBNM_GLIB_CFLAGS) \
 	$(common_CFLAGS)
 
 libnm_vpn_plugin_strongswan_la_LIBADD = \
 	$(GTK_LIBS) \
-	$(NM_UTILS_LIBS)
+	$(LIBNM_GLIB_LIBS)
 
 libnm_strongswan_properties_la_LIBADD = \
 	$(GTK_LIBS) \
-	$(NM_UTILS_LIBS)
+	$(LIBNM_GLIB_LIBS)
 
 libnm_vpn_plugin_strongswan_la_LDFLAGS = \
 	-avoid-version