[network-manager-fortisslvpn] build: allow build without libnm-glib

[Lubomir Rintel <lkundrak src gnome org>]

commit 0e7b48536a159871c4f11ca69ed36edc96f1a07c
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Sep 25 19:58:08 2015 +0200

    build: allow build without libnm-glib

 configure.ac           |   23 ++++++++++++++---------
 properties/Makefile.am |    8 +++++---
 2 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4bb201c..b1b3242 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,8 @@ dnl GNOME support
 dnl
 AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-fortisslvpn without GNOME 
support, e.g. vpn service only]))
 AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-fortisslvpn without 
libnm-glib comatibility]))
+AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno)
 
 GETTEXT_PACKAGE=NetworkManager-fortisslvpn
 AC_SUBST(GETTEXT_PACKAGE)
@@ -67,14 +69,6 @@ AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
 
-PKG_CHECK_MODULES(LIBNM_GLIB,
-                  NetworkManager >= 1.1.0
-                  libnm-util >= 1.1.0
-                  libnm-glib >= 1.1.0
-                  libnm-glib-vpn >= 1.1.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"
-
 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"
@@ -83,9 +77,20 @@ 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(LIBNM_GTK, libnm-gtk >= 1.0.4)
        PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0)
        PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
+
+       if test x"$with_libnm_glib" != xno; then
+               PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.0.4)
+
+               PKG_CHECK_MODULES(LIBNM_GLIB,
+                               NetworkManager >= 1.1.0
+                               libnm-util >= 1.1.0
+                               libnm-glib >= 1.1.0
+                               libnm-glib-vpn >= 1.1.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
 
 NM_COMPILER_WARNINGS
diff --git a/properties/Makefile.am b/properties/Makefile.am
index a4d309c..2d5620e 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,7 +1,9 @@
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES =                                   \
-       libnm-vpn-plugin-fortisslvpn.la                 \
-       libnm-fortisslvpn-properties.la
+
+plugin_LTLIBRARIES = libnm-vpn-plugin-fortisslvpn.la
+if WITH_LIBNM_GLIB
+plugin_LTLIBRARIES += libnm-fortisslvpn-properties.la
+endif
 
 libnm_vpn_plugin_fortisslvpn_la_SOURCES =              \
        nm-fortisslvpn.c                                \