[network-manager-fortisslvpn] build: check for libnm & libnma

[Lubomir Rintel <lkundrak src gnome org>]

commit 3a4510d2077506c5951c1b51b821b20a63d9764e
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Sep 25 18:28:26 2015 +0200

    build: check for libnm & libnma

 auth-dialog/Makefile.am |    8 ++++----
 configure.ac            |   18 +++++++++---------
 properties/Makefile.am  |   16 ++++++++--------
 src/Makefile.am         |    8 ++++----
 4 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index e1da6c2..cb261cc 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -1,10 +1,10 @@
 libexec_PROGRAMS = nm-fortisslvpn-auth-dialog
 
 nm_fortisslvpn_auth_dialog_CPPFLAGS =          \
-       $(NM_CFLAGS)                            \
+       $(LIBNM_GLIB_CFLAGS)                    \
        $(GLIB_CFLAGS)                          \
        $(GTK_CFLAGS)                           \
-       $(NMGTK_CFLAGS)                         \
+       $(LIBNM_GTK_CFLAGS)                     \
        $(LIBSECRET_CFLAGS)                     \
        -I$(top_srcdir)                         \
        -DUIDIR=\""$(uidir)"\"                  \
@@ -14,9 +14,9 @@ nm_fortisslvpn_auth_dialog_SOURCES =          \
        main.c
 
 nm_fortisslvpn_auth_dialog_LDADD =             \
-       $(NM_LIBS)                              \
+       $(LIBNM_GLIB_LIBS)                      \
        $(GTK_LIBS)                             \
-       $(NMGTK_LIBS)                           \
+       $(LIBNM_GTK_LIBS)                       \
        $(LIBSECRET_LIBS)
 
 CLEANFILES = *~
diff --git a/configure.ac b/configure.ac
index 7fcc7ed..bf0067f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,25 +68,25 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
 
 PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.74)
 
-PKG_CHECK_MODULES(NM,
+PKG_CHECK_MODULES(LIBNM_GLIB,
                   NetworkManager >= 0.9.10
                   libnm-util >= 0.9.10
                   libnm-glib >= 0.9.10
                   libnm-glib-vpn >= 0.9.10)
-AC_SUBST(NM_CFLAGS)
-AC_SUBST(NM_LIBS)
+AC_SUBST(LIBNM_GLIB_CFLAGS)
+AC_SUBST(LIBNM_GLIB_LIBS)
+
+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"
 
 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(NMGTK, libnm-gtk >= 1.0.4)
-       AC_SUBST(NMGTK_CFLAGS)
-       AC_SUBST(NMGTK_LIBS)
-
+       PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.0.4)
+       PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0)
        PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
-       AC_SUBST(LIBSECRET_CFLAGS)
-       AC_SUBST(LIBSECRET_LIBS)
 fi
 
 NM_COMPILER_WARNINGS
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 0a8226b..b5975c0 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -23,25 +23,25 @@ common_CFLAGS =                                             \
        -DVERSION=\"$(VERSION)\"
 
 libnm_vpn_plugin_fortisslvpn_la_CFLAGS =               \
-       $(NM_CFLAGS)                                    \
-       $(NMGTK_CFLAGS)                                 \
+       $(LIBNM_GLIB_CFLAGS)                            \
+       $(LIBNM_GTK_CFLAGS)                             \
        $(common_CFLAGS)
 
 libnm_fortisslvpn_properties_la_CFLAGS =               \
        -DNM_OPENVPN_OLD                                \
-       $(NM_CFLAGS)                                    \
-       $(NMGTK_CFLAGS)                                 \
+       $(LIBNM_GLIB_CFLAGS)                            \
+       $(LIBNM_GTK_CFLAGS)                             \
        $(common_CFLAGS)
 
 libnm_vpn_plugin_fortisslvpn_la_LIBADD =               \
        $(GTK_LIBS)                                     \
-       $(NM_LIBS)                                      \
-       $(NMGTK_LIBS)
+       $(LIBNM_GLIB_LIBS)                              \
+       $(LIBNM_GTK_LIBS)
 
 libnm_fortisslvpn_properties_la_LIBADD =               \
        $(GTK_LIBS)                                     \
-       $(NM_LIBS)                                      \
-       $(NMGTK_LIBS)
+       $(LIBNM_GLIB_LIBS)                              \
+       $(LIBNM_GTK_LIBS)
 
 libnm_vpn_plugin_fortisslvpn_la_LDFLAGS =              \
        -avoid-version
diff --git a/src/Makefile.am b/src/Makefile.am
index 19d3fe7..9f8015b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ install-data-hook:
 AM_CPPFLAGS =                                                  \
        $(DBUS_GLIB_CFLAGS)                                     \
        $(GLIB_CFLAGS)                                          \
-       $(NM_CFLAGS)                                            \
+       $(LIBNM_GLIB_CFLAGS)                                    \
        -I$(top_srcdir)                                         \
        -DG_DISABLE_DEPRECATED                                  \
        -DNM_FORTISSLVPN_LOCALEDIR=\"$(datadir)/locale\"        \
@@ -26,7 +26,7 @@ nm-fortisslvpn-pppd-service-glue.h: $(top_srcdir)/src/nm-fortisslvpn-pppd-servic
 nm_fortisslvpn_service_LDADD =                                 \
        $(DBUS_GLIB_LIBS)                                       \
        $(GLIB_LIBS)                                            \
-       $(NM_LIBS)
+       $(LIBNM_GLIB_LIBS)
 
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 pppd_plugin_LTLIBRARIES = nm-fortisslvpn-pppd-plugin.la
@@ -38,14 +38,14 @@ nm_fortisslvpn_pppd_plugin_la_SOURCES =                             \
 nm_fortisslvpn_pppd_plugin_la_CPPFLAGS =                       \
        $(DBUS_GLIB_CFLAGS)                                     \
        $(GLIB_CFLAGS)                                          \
-       $(NM_CFLAGS)
+       $(LIBNM_GLIB_CFLAGS)
 
 nm_fortisslvpn_pppd_plugin_la_LDFLAGS = -module -avoid-version
 
 nm_fortisslvpn_pppd_plugin_la_LIBADD =                         \
        $(DBUS_GLIB_LIBS)                                       \
        $(GLIB_LIBS)                                            \
-       $(NM_LIBS)
+       $(LIBNM_GLIB_LIBS)
 
 BUILT_SOURCES = nm-fortisslvpn-pppd-service-glue.h