[network-manager-applet/th/build-non-recursive-make-bgo778400: 20/21] build: add configure option --without-libnm-gtk to build without legacy library

[Thomas Haller <thaller src gnome org>]

commit 1b61161a75c96715b12d88203c123c007d7160ad
Author: Thomas Haller <thaller redhat com>
Date:   Thu Feb 9 18:37:43 2017 +0100

    build: add configure option --without-libnm-gtk to build without legacy library
    
    https://bugzilla.gnome.org/show_bug.cgi?id=760887

 Makefile.am  |    7 +++++++
 configure.ac |   33 +++++++++++++++++++++++----------
 2 files changed, 30 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index eb0d1e6..6410f7e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,6 +174,7 @@ src_utils_libutils_libnm_la_LIBADD = \
        $(GTK_LIBS) \
        $(LIBNM_LIBS)
 
+if WITH_LIBNM_GTK
 
 noinst_LTLIBRARIES += src/utils/libutils-libnm-glib.la
 
@@ -192,6 +193,7 @@ src_utils_libutils_libnm_glib_la_LIBADD = \
        $(GTK_LIBS) \
        $(LIBNM_GLIB_LIBS)
 
+endif
 
 check_programs += src/utils/tests/test-utils
 
@@ -278,6 +280,7 @@ src_wireless_security_libwireless_security_libnm_la_LIBADD = \
 
 $(src_wireless_security_libwireless_security_libnm_la_OBJECTS): $(wireless_security_h_gen)
 
+if WITH_LIBNM_GTK
 
 noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm-glib.la
 
@@ -301,6 +304,7 @@ src_wireless_security_libwireless_security_libnm_glib_la_LIBADD = \
 
 $(src_wireless_security_libwireless_security_libnm_glib_la_OBJECTS): $(wireless_security_h_gen)
 
+endif
 
 EXTRA_DIST += \
        src/wireless-security/eap-method-fast.ui \
@@ -318,6 +322,8 @@ EXTRA_DIST += \
 
 ###############################################################################
 
+if WITH_LIBNM_GTK
+
 src/libnm-gtk/nm-resources.h: src/libnm-gtk/nm.gresource.xml
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnm-gtk 
--generate-header --internal
 
@@ -429,6 +435,7 @@ src_libnm_gtk_tests_test_mobile_providers_LDADD = \
        src/libnm-gtk/libnm-gtk.la \
        $(LIBNM_GLIB_LIBS)
 
+endif
 
 EXTRA_DIST += \
        src/libnm-gtk/libnm-gtk.pc.in \
diff --git a/configure.ac b/configure.ac
index f3f580f..8d059e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,16 +71,25 @@ else
     AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["$prefix"],[ISO codes prefix])
 fi
 
-PKG_CHECK_MODULES(LIBNM_GLIB,
-               [gio-2.0 >= 2.32
-                NetworkManager >= 1.3
-                libnm-glib >= 1.3
-                libnm-util >= 1.3
-                libnm-glib-vpn >= 1.3
-                gmodule-export-2.0])
-LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
-LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4"
-LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4"
+AC_ARG_WITH(libnm-gtk, AS_HELP_STRING([--without-libnm-gtk], [dont build legacy library libnm-gtk which 
depends on libnm-glib/libnm-util/dbus-glib]))
+if test "$with_libnm_gtk" != no; then
+       PKG_CHECK_MODULES(LIBNM_GLIB,
+                       [gio-2.0 >= 2.32
+                        NetworkManager >= 1.3
+                        libnm-glib >= 1.3
+                        libnm-util >= 1.3
+                        libnm-glib-vpn >= 1.3
+                        gmodule-export-2.0],
+                        :,
+                        [AC_MSG_FAILURE([$LIBNM_GLIB_PKG_ERRORS
+
+Configure with --without-libnm-gtk if you do not need the legacy library])])
+       with_libnm_gtk=yes
+       LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
+       LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4"
+       LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4"
+fi
+AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" != "no")
 
 PKG_CHECK_MODULES(LIBNM, [libnm >= 1.3 gio-2.0 >= 2.32 gmodule-export-2.0])
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
@@ -172,3 +181,7 @@ man/nm-connection-editor.1
 org.gnome.nm-applet.gschema.xml
 ])
 AC_OUTPUT
+
+echo ""
+echo "  --with-libnm-gtk=${with_libnm_gtk}"
+echo ""