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

[Lubomir Rintel <lkundrak src gnome org>]

commit ce62d8e7e5d26e3c0079ee6abae8dadefc7d7a8f
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Jul 17 14:41:31 2015 +0200

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

 configure.ac                 |    8 +++++++-
 properties/Makefile.am       |    8 ++++----
 properties/advanced-dialog.c |    2 +-
 properties/import-export.c   |    2 +-
 properties/nm-pptp.c         |    2 ++
 5 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 30d8756..09185ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,8 @@ PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.74)
 
 PKG_CHECK_MODULES(NM,
                   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,11 @@ 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"
+PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0)
+
 NM_COMPILER_WARNINGS
 
 dnl
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 190dbcd..ca05bfd 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)                                 \
+        $(LIBNMA_CFLAGS)                                \
        -I$(top_srcdir)/src                             \
         -DICONDIR=\""$(datadir)/pixmaps"\"              \
         -DUIDIR=\""$(uidir)"\"                          \
@@ -28,8 +28,8 @@ libnm_pptp_properties_la_CFLAGS =                       \
 
 libnm_pptp_properties_la_LIBADD = \
         $(GTK_LIBS) \
-        $(NM_LIBS) \
-        $(NMGTK_LIBS)
+        $(LIBNM_LIBS) \
+        $(LIBNMA_LIBS)
 
 libnm_pptp_properties_la_LDFLAGS =   \
         -avoid-version
diff --git a/properties/advanced-dialog.c b/properties/advanced-dialog.c
index 7429319..10bb848 100644
--- a/properties/advanced-dialog.c
+++ b/properties/advanced-dialog.c
@@ -39,7 +39,7 @@
 
 #include "advanced-dialog.h"
 #include "nm-pptp.h"
-#include "../src/nm-pptp-service.h"
+#include "../src/nm-pptp-service-defines.h"
 
 #define COL_NAME  0
 #define COL_VALUE 1
diff --git a/properties/import-export.c b/properties/import-export.c
index c9cb1b7..5ef040c 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -38,7 +38,7 @@
 
 #include "import-export.h"
 #include "nm-pptp.h"
-#include "../src/nm-pptp-service.h"
+#include "../src/nm-pptp-service-defines.h"
 
 NMConnection *
 do_import (const char *path, char **lines, GError **error)
diff --git a/properties/nm-pptp.c b/properties/nm-pptp.c
index e017716..242f9e4 100644
--- a/properties/nm-pptp.c
+++ b/properties/nm-pptp.c
@@ -36,6 +36,8 @@
 
 #include <NetworkManager.h>
 
+#include <libnma/nma-ui-utils.h>
+
 #include "nm-pptp-service-defines.h"
 #include "nm-pptp.h"
 #include "import-export.h"