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

[Dan Winship <danw src gnome org>]

commit 5b95b926c287bfcdd7ddf39fab3fc7ae903b5589
Author: Dan Winship <danw redhat com>
Date:   Tue Nov 25 17:22:02 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.
    
    Remove unnecessary -I flags from Makefiles.
    
    Remove "#define NM_VPN_API_SUBJECT_TO_CHANGE", since that define has
    had no effect since before NM 0.7.

 auth-dialog/Makefile.am     |    1 -
 configure.ac                |   14 --------------
 properties/nm-openconnect.c |    2 --
 src/Makefile.am             |    1 -
 4 files changed, 0 insertions(+), 18 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 55a29cb..c0c135d 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -7,7 +7,6 @@ nm_openconnect_auth_dialog_CPPFLAGS = \
        $(OPENCONNECT_CFLAGS) \
        $(LIBXML_CFLAGS) \
        $(LIBSECRET_CFLAGS) \
-       -I${top_srcdir} \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DBINDIR=\""$(bindir)"\" \
        -DG_DISABLE_DEPRECATED \
diff --git a/configure.ac b/configure.ac
index fe214a8..654999a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,32 +53,20 @@ IT_PROG_INTLTOOL([0.35])
 AM_GLIB_GNU_GETTEXT
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
 GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
 
 PKG_CHECK_MODULES(LIBXML, libxml-2.0)
-AC_SUBST(LIBXML_CFLAGS)
-AC_SUBST(LIBXML_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
        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"
 
        PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
-       AC_SUBST(LIBSECRET_CFLAGS)
-       AC_SUBST(LIBSECRET_LIBS)
 
        if test x"$with_authdlg" != xno; then
                PKG_CHECK_MODULES(OPENCONNECT, openconnect >= 3.02)
-               AC_SUBST(OPENCONNECT_CFLAGS)
-               AC_SUBST(OPENCONNECT_LIBS)
        fi
 fi
 
@@ -87,8 +75,6 @@ PKG_CHECK_MODULES(NM,
                   libnm-util >= 0.9.10
                   libnm-glib  >= 0.9.10
                   libnm-glib-vpn >= 0.9.10)
-AC_SUBST(NM_CFLAGS)
-AC_SUBST(NM_LIBS)
 
 dnl
 dnl Distribution version string
diff --git a/properties/nm-openconnect.c b/properties/nm-openconnect.c
index dfd5f5c..5f4998a 100644
--- a/properties/nm-openconnect.c
+++ b/properties/nm-openconnect.c
@@ -49,8 +49,6 @@
 #define openconnect_has_oath_support() 0
 #endif
 
-#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 ae2077d..b6c6ff7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,6 @@ AM_CPPFLAGS = \
        $(DBUS_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(NM_CFLAGS) \
-       -I${top_srcdir} \
        -DG_DISABLE_DEPRECATED \
        -DBINDIR=\"$(bindir)\" \
        -DPREFIX=\""$(prefix)"\" \