[network-manager-applet/dcbw/libnm-bgo736911: 4/16] build: misc cruft removal

[Dan Williams <dcbw src gnome org>]

commit 62bcc9635bdb6312a618dbc589af02af2d1289f1
Author: Dan Winship <danw redhat com>
Date:   Tue Nov 25 09:10:08 2014 -0500

    build: misc cruft removal
    
    Remove "PKG_CHECK_MODULES(GOBJECT, gobject-2.0)", which wasn't being
    used, and which was already implied by other checks.
    
    Remove a bunch of unecessary AC_SUBST() calls in configure.ac.
    (PKG_CHECK_MODULES automatically substs the variables it sets.)
    
    Remove GNOME_MAINTAINER_MODE_DEFINES, which just sets a bunch of
    irrelevant flags like BONOBO_DISABLE_DEPRECATED.

 configure.ac                      |   14 --------------
 src/Makefile.am                   |    1 -
 src/connection-editor/Makefile.am |    1 -
 src/libnm-gtk/Makefile.am         |    1 -
 src/utils/Makefile.am             |    1 -
 src/wireless-security/Makefile.am |    1 -
 6 files changed, 0 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6843823..09a4fb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,8 +69,6 @@ else
     AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["$prefix"],[ISO codes prefix])
 fi
 
-PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
-
 PKG_CHECK_MODULES(NMA,
                [dbus-glib-1 >= 0.74
                 gio-2.0 >= 2.32
@@ -83,8 +81,6 @@ PKG_CHECK_MODULES(NMA,
 NMA_CFLAGS="$NMA_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
 
 PKG_CHECK_MODULES(LIBSECRET, [libsecret-unstable])
-AC_SUBST(LIBSECRET_CFLAGS)
-AC_SUBST(LIBSECRET_LIBS)
 
 # Check for libnotify >= 0.7
 PKG_CHECK_MODULES(LIBNOTIFY_07, [libnotify >= 0.7], [have_libnotify_07=yes],[have_libnotify_07=no])
@@ -92,12 +88,8 @@ if test x"$have_libnotify_07" = "xyes"; then
        AC_DEFINE(HAVE_LIBNOTIFY_07, 1, [Define if you have libnotify 0.7 or later])
 fi
 PKG_CHECK_MODULES(NOTIFY, [libnotify >= 0.4.3])
-AC_SUBST(NOTIFY_CFLAGS)
-AC_SUBST(NOTIFY_LIBS)
 
 PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
 GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
 
 AC_ARG_WITH([appindicator], AS_HELP_STRING([--with-appindicator|--without-appindicator], [Build with 
libappindicator support instead of xembed systray support.]))
@@ -115,8 +107,6 @@ if (test "${with_wwan}" != "no"); then
                       [mm-glib],
                       [have_libmm_glib=yes],
                       [have_libmm_glib=no])
-    AC_SUBST(MM_GLIB_CFLAGS)
-    AC_SUBST(MM_GLIB_LIBS)
 
     if (test "${have_libmm_glib}" = "no"); then
         if (test "${with_wwan}" = "yes"); then
@@ -136,8 +126,6 @@ AM_CONDITIONAL(WITH_WWAN, test "${with_wwan}" = "yes")
 
 dnl Check for gudev
 PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
-AC_SUBST(GUDEV_CFLAGS)
-AC_SUBST(GUDEV_LIBS)
 
 dnl Check for gobject introspection
 GOBJECT_INTROSPECTION_CHECK([0.9.6])
@@ -148,8 +136,6 @@ dnl
 dnl Compiler flags
 dnl
 NM_COMPILER_WARNINGS
-# Use --enable-maintainer-mode to disabled deprecated symbols
-GNOME_MAINTAINER_MODE_DEFINES
 
 
 AC_CONFIG_FILES([
diff --git a/src/Makefile.am b/src/Makefile.am
index 2aad0bf..9379a51 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,6 @@ nm_applet_CPPFLAGS = \
        -DNMALOCALEDIR=\"$(datadir)/locale\"                                    \
        -DG_LOG_DOMAIN=\""nm-applet"\" \
        $(DBUS_CFLAGS)                                                                          \
-       $(DISABLE_DEPRECATED)   \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/wireless-security \
        -I${top_srcdir}/src/libnm-gtk
diff --git a/src/connection-editor/Makefile.am b/src/connection-editor/Makefile.am
index b1b5588..bc6c14c 100644
--- a/src/connection-editor/Makefile.am
+++ b/src/connection-editor/Makefile.am
@@ -13,7 +13,6 @@ nm_connection_editor_CPPFLAGS = \
        -DDATADIR=\""$(datadir)"\" \
        -DNMALOCALEDIR=\"$(datadir)/locale\" \
        $(DBUS_CFLAGS) \
-       $(DISABLE_DEPRECATED) \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/wireless-security \
        -I${top_srcdir}/src/libnm-gtk
diff --git a/src/libnm-gtk/Makefile.am b/src/libnm-gtk/Makefile.am
index 1d21b6a..c2a75a4 100644
--- a/src/libnm-gtk/Makefile.am
+++ b/src/libnm-gtk/Makefile.am
@@ -38,7 +38,6 @@ libnm_gtk_la_CFLAGS = \
        -DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
        -DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\" \
        -DNMALOCALEDIR=\"$(datadir)/locale\" \
-       $(DISABLE_DEPRECATED) \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/wireless-security
 
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 8c56353..c2cbe9e 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -10,7 +10,6 @@ libutils_la_SOURCES = \
 libutils_la_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(NMA_CFLAGS) \
-       $(DISABLE_DEPRECATED) \
        -I${top_srcdir}/src
 
 libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS)
diff --git a/src/wireless-security/Makefile.am b/src/wireless-security/Makefile.am
index f8098f7..4203050 100644
--- a/src/wireless-security/Makefile.am
+++ b/src/wireless-security/Makefile.am
@@ -34,7 +34,6 @@ libwireless_security_la_CPPFLAGS = \
        $(GTK_CFLAGS) \
        -DUIDIR=\""$(uidir)"\" \
        $(NMA_CFLAGS) \
-       $(DISABLE_DEPRECATED) \
        -I${top_srcdir}/src/utils
 
 libwireless_security_la_LIBADD = \