[network-manager-iodine/danw/cleanup-bgo746693: 1/4] build: remove some unnecessary stuff

[Dan Winship <danw src gnome org>]

commit d4493e7dba0cc60d0bb126c6053fe7650dd89ac0
Author: Dan Winship <danw redhat com>
Date:   Tue Nov 25 17:27:53 2014 -0500

    build: remove some unnecessary stuff
    
    PKG_CHECK_MODULES() automatically AC_SUBST()s the variables it
    creates, so we don't need to do it ourselves.
    
    Drop unnecessary explicit checks for gthread and dbus-glib.
    
    Remove unused INCLUDES= lines from Makefiles.
    
    Remove stray GConf references.
    
    Remove "#define NM_VPN_API_SUBJECT_TO_CHANGE", since that define has
    had no effect since before NM 0.7.

 auth-dialog/Makefile.am |    3 ---
 configure.ac            |   16 ----------------
 properties/Makefile.am  |    2 --
 properties/nm-iodine.c  |    2 --
 src/Makefile.am         |    6 ------
 5 files changed, 0 insertions(+), 29 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 2f26959..08f9e20 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -1,10 +1,7 @@
-INCLUDES = -I${top_srcdir}
-
 libexec_PROGRAMS = nm-iodine-auth-dialog
 
 nm_iodine_auth_dialog_CPPFLAGS = \
        $(NM_CFLAGS) \
-       $(GTHREAD_CFLAGS) \
        $(GTK_CFLAGS) \
         $(LIBSECRET_CFLAGS) \
         $(NMGTK_CFLAGS) \
diff --git a/configure.ac b/configure.ac
index fb146d9..972b7b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,24 +52,12 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 IT_PROG_INTLTOOL([0.35])
 AM_GLIB_GNU_GETTEXT
 
-PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
-AC_SUBST(GTHREAD_CFLAGS)
-AC_SUBST(GTHREAD_LIBS)
-
-PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74)
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-
 if test x"$with_gnome" != xno; then
        gtk3_req=2.91.4
        PKG_CHECK_MODULES(GTK, gtk+-3.0 > $gtk3_req, ,
                          [PKG_CHECK_MODULES(GTK, gtk+-2.0 > $gtk2_req)])
-       AC_SUBST(GTK_CFLAGS)
-       AC_SUBST(GTK_LIBS)
 
         PKG_CHECK_MODULES(LIBSECRET, libsecret-1)
-        AC_SUBST(LIBSECRET_CFLAGS)
-        AC_SUBST(LIBSECRET_LIBS)
 fi
 
 PKG_CHECK_MODULES(NM,
@@ -77,12 +65,8 @@ PKG_CHECK_MODULES(NM,
                   libnm-util >= 0.9.2
                   libnm-glib  >= 0.9.2
                   libnm-glib-vpn >= 0.9.2)
-AC_SUBST(NM_CFLAGS)
-AC_SUBST(NM_LIBS)
 
 PKG_CHECK_MODULES(NMGTK, libnm-gtk >= 0.9.9.0)
-AC_SUBST(NMGTK_CFLAGS)
-AC_SUBST(NMGTK_LIBS)
 
 NM_COMPILER_WARNINGS
 
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 30e7529..0b72cb7 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -10,7 +10,6 @@ ui_DATA = nm-iodine-dialog.ui
 
 libnm_iodine_properties_la_CFLAGS =                    \
         $(GTK_CFLAGS)                                   \
-        $(GCONF_CFLAGS)                                 \
         $(NM_CFLAGS)                                   \
         -DICONDIR=\""$(datadir)/pixmaps"\"              \
         -DUIDIR=\""$(uidir)"\"                          \
@@ -22,7 +21,6 @@ libnm_iodine_properties_la_CFLAGS =                   \
 
 libnm_iodine_properties_la_LIBADD = \
         $(GTK_LIBS) \
-        $(GCONF_LIBS) \
         $(NM_LIBS)
 
 libnm_iodine_properties_la_LDFLAGS =      \
diff --git a/properties/nm-iodine.c b/properties/nm-iodine.c
index b1e7537..41ed7af 100644
--- a/properties/nm-iodine.c
+++ b/properties/nm-iodine.c
@@ -33,8 +33,6 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#define NM_VPN_API_SUBJECT_TO_CHANGE
-
 #include <nm-vpn-plugin-ui-interface.h>
 #include <nm-setting-vpn.h>
 #include <nm-setting-connection.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index c7f3a1e..d8a8f3f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,4 @@
-INCLUDES = -I${top_srcdir} 
-
 AM_CPPFLAGS = \
-       $(DBUS_CFLAGS) \
-       $(GTHREAD_CFLAGS) \
        $(NM_CFLAGS) \
        -DG_DISABLE_DEPRECATED \
        -DBINDIR=\"$(bindir)\" \
@@ -23,8 +19,6 @@ nm_iodine_service_SOURCES = \
 
 
 nm_iodine_service_LDADD = \
-       $(DBUS_LIBS) \
-       $(GTHREAD_LIBS) \
        $(NM_LIBS)
 
 CLEANFILES = *~