[network-manager-openconnect/lr/libnm: 7/11] build: allow build without libnm-glib

[Lubomir Rintel <lkundrak src gnome org>]

commit 6baeb314c00b1d63a27a227ae330bca993880c2f
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Jul 24 18:12:47 2015 +0200

    build: allow build without libnm-glib

 configure.ac           |   17 +++++++++++------
 properties/Makefile.am |    5 ++++-
 2 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index efb7c2b..1760ff4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,9 @@ dnl
 AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openconnect 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-openconnect without 
libnm-glib comatibility]))
+AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno)
+
 AC_ARG_WITH(authdlg, AS_HELP_STRING([--without-authdlg], [Build NetworkManager-openconnect without 
authentication dialog]))
 AM_CONDITIONAL(WITH_AUTHDLG, test x"$with_authdlg" != xno)
 
@@ -68,13 +71,15 @@ if test x"$with_gnome" != xno; then
        if test x"$with_authdlg" != xno; then
                PKG_CHECK_MODULES(OPENCONNECT, openconnect >= 3.02)
        fi
-fi
 
-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)
+       if test x"$with_libnm_glib" != xno; then
+               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)
+       fi
+fi
 
 dnl
 dnl Distribution version string
diff --git a/properties/Makefile.am b/properties/Makefile.am
index aba4b1f..566b004 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,5 +1,8 @@
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-openconnect-properties.la libnm-openconnect-properties-old.la
+plugin_LTLIBRARIES = libnm-openconnect-properties.la
+if WITH_LIBNM_GLIB
+plugin_LTLIBRARIES += libnm-openconnect-properties-old.la
+endif
 
 libnm_openconnect_properties_la_SOURCES = \
        auth-helpers.c \