[network-manager-pptp/lr/libnm: 7/13] fixup! all: port pptp plugin to libnm

[Lubomir Rintel <lkundrak src gnome org>]

commit 195991d7b0d75f4170a65e2bd656210ed66c7b16
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Sat Jul 25 09:46:19 2015 +0200

    fixup! all: port pptp plugin to libnm
    
    Bring back libnm-glib for the build.

 auth-dialog/Makefile.am |    4 ++--
 configure.ac            |    9 +++++++--
 properties/Makefile.am  |    4 ++--
 src/Makefile.am         |    8 ++++----
 4 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index b1202a9..3ba28fc 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -1,7 +1,7 @@
 libexec_PROGRAMS = nm-pptp-auth-dialog
 
 nm_pptp_auth_dialog_CPPFLAGS =                 \
-       $(NM_CFLAGS)            \
+       $(LIBNM_GLIB_CFLAGS)                    \
        $(GLIB_CFLAGS)                          \
        $(GTK_CFLAGS)                           \
        $(NMGTK_CFLAGS)                         \
@@ -17,7 +17,7 @@ nm_pptp_auth_dialog_SOURCES = \
        main.c
 
 nm_pptp_auth_dialog_LDADD = \
-       $(NM_LIBS) \
+       $(LIBNM_GLIB_LIBS) \
        $(GTK_LIBS) \
        $(NMGTK_LIBS) \
        $(LIBSECRET_LIBS)
diff --git a/configure.ac b/configure.ac
index 30d8756..2d4638b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,9 +66,10 @@ 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 >= 1.0
-                  libnm >= 1.0)
+                  libnm-glib >= 1.0
+                  libnm-glib-vpn >= 1.0)
 
 if test x"$with_gnome" != xno; then
        PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
@@ -79,6 +80,10 @@ if test x"$with_gnome" != xno; then
        PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
 fi
 
+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"
+
 NM_COMPILER_WARNINGS
 
 dnl
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 190dbcd..39f8f40 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -17,8 +17,8 @@ ui_DATA = nm-pptp-dialog.ui
 libnm_pptp_properties_la_CFLAGS =                       \
         $(GLIB_CFLAGS)                                  \
         $(GTK_CFLAGS)                                   \
-        $(NM_CFLAGS)                                    \
         $(NMGTK_CFLAGS)                                 \
+        $(LIBNM_CFLAGS)                                 \
        -I$(top_srcdir)/src                             \
         -DICONDIR=\""$(datadir)/pixmaps"\"              \
         -DUIDIR=\""$(uidir)"\"                          \
@@ -28,7 +28,7 @@ libnm_pptp_properties_la_CFLAGS =                       \
 
 libnm_pptp_properties_la_LIBADD = \
         $(GTK_LIBS) \
-        $(NM_LIBS) \
+        $(LIBNM_LIBS) \
         $(NMGTK_LIBS)
 
 libnm_pptp_properties_la_LDFLAGS =   \
diff --git a/src/Makefile.am b/src/Makefile.am
index d3a210a..1641b7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS =                                                  \
        $(DBUS_GLIB_CFLAGS)                                     \
        $(GLIB_CFLAGS)                                          \
-       $(NM_CFLAGS)                                            \
+       $(LIBNM_GLIB_CFLAGS)                                    \
        -I${top_srcdir}                                         \
        -DG_DISABLE_DEPRECATED                                  \
        -DBINDIR=\"$(bindir)\"                                  \
@@ -28,7 +28,7 @@ nm-pptp-pppd-service-glue.h: $(top_srcdir)/src/nm-pptp-pppd-service.xml
 nm_pptp_service_LDADD = \
        $(DBUS_GLIB_LIBS) \
        $(GLIB_LIBS) \
-       $(NM_LIBS)
+       $(LIBNM_GLIB_LIBS)
 
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 pppd_plugin_LTLIBRARIES = nm-pptp-pppd-plugin.la
@@ -40,14 +40,14 @@ nm_pptp_pppd_plugin_la_SOURCES = \
 nm_pptp_pppd_plugin_la_CPPFLAGS = \
        $(DBUS_GLIB_CFLAGS) \
        $(GLIB_CFLAGS) \
-       $(NM_CFLAGS)
+       $(LIBNM_GLIB_CFLAGS)
 
 nm_pptp_pppd_plugin_la_LDFLAGS = -module -avoid-version
 
 nm_pptp_pppd_plugin_la_LIBADD = \
        $(DBUS_GLIB_LIBS) \
        $(GLIB_LIBS) \
-       $(NM_LIBS)
+       $(LIBNM_GLIB_LIBS)
 
 BUILT_SOURCES = nm-pptp-pppd-service-glue.h