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

[Dan Winship <danw src gnome org>]

commit 58ea728768d0980e90b68d75bce6b9dc37921f32
Author: Dan Winship <danw redhat com>
Date:   Tue Nov 25 17:30:29 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 "#define NM_VPN_API_SUBJECT_TO_CHANGE", since that define has
    had no effect since before NM 0.7.
    
    Remove never-used icon and .desktop file.
    
    Remove alleged example that uses GConf.

 Makefile.am                                |   18 +-----------------
 configure.ac                               |   12 ------------
 doc/example-pptp-system-wide-connection.sh |   25 -------------------------
 gnome-mime-application-x-pptp-settings.png |  Bin 2595 -> 0 bytes
 nm-pptp.desktop.in                         |   11 -----------
 properties/nm-pptp.c                       |    2 --
 6 files changed, 1 insertions(+), 67 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8cf1ebe..37222c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,20 +12,6 @@ dbusservice_DATA = nm-pptp-service.conf
 nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
 nmvpnservice_DATA = nm-pptp-service.name
 
-desktopfile = nm-pptp.desktop.in
-iconfile = gnome-mime-application-x-pptp-settings.png
-
-if WITH_GNOME
-# FIXME: uncomment when nmce gets --import support
-#desktopdir = $(datadir)/applications
-#desktop_in_files = $(desktopfile)
-#desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-# INTLTOOL_DESKTOP_RULE@
-
-#icondir = $(datadir)/icons/hicolor/48x48/apps
-#icon_DATA = $(iconfile)
-endif
-
 nm-pptp-service.name: $(srcdir)/nm-pptp-service.name.in
        sed -e 's|[ ]LIBEXECDIR[@]|$(libexecdir)|g' \
            -e 's|[ ]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
@@ -35,13 +21,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
 
 EXTRA_DIST = nm-pptp-service.name.in \
              $(dbusservice_DATA)  \
-             $(desktopfile) \
-             $(iconfile) \
              intltool-extract.in  \
              intltool-merge.in    \
              intltool-update.in
 
-CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~
+CLEANFILES = $(nmvpnservice_DATA) *~
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 6e32160..c5dd55b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,35 +62,23 @@ 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(DBUS, dbus-glib-1 >= 0.74)
-AC_SUBST(DBUS_GLIB_CFLAGS)
-AC_SUBST(DBUS_GLIB_LIBS)
 
 PKG_CHECK_MODULES(NM,
                   NetworkManager >= 0.9.10
                   libnm-util >= 0.9.10
                   libnm-glib >= 0.9.10
                   libnm-glib-vpn >= 0.9.10)
-AC_SUBST(NM_CFLAGS)
-AC_SUBST(NM_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(NMGTK, libnm-gtk >= 0.9.10)
-       AC_SUBST(NMGTK_CFLAGS)
-       AC_SUBST(NMGTK_LIBS)
 
        PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
-       AC_SUBST(LIBSECRET_CFLAGS)
-       AC_SUBST(LIBSECRET_LIBS)
 fi
 
 NM_COMPILER_WARNINGS
diff --git a/properties/nm-pptp.c b/properties/nm-pptp.c
index 4f4a349..58cfa67 100644
--- a/properties/nm-pptp.c
+++ b/properties/nm-pptp.c
@@ -34,8 +34,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>