From fe19971638c017d59ce8f51e9743fe10dec78c3c Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 1 Dec 2006 20:13:09 +0000
Subject: [PATCH] Small configure.in and applet makefile cleanups

- Consolidate Gnome/GTK deprecation defines
- Remove VERSION define from applet makefile, it's in config.h already


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2134 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
---
 configure.in             | 9 +++++++++
 gnome/applet/Makefile.am | 5 +----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 4a9b501b6..2db3aa0f5 100644
--- a/configure.in
+++ b/configure.in
@@ -14,6 +14,15 @@ AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
+dnl
+dnl This doesn't depend on gnome support, only on gnome-common, autogen already
+dnl uses gnome-autogen
+dnl
+GNOME_COMMON_INIT
+GNOME_DEBUG_CHECK
+GNOME_COMPILE_WARNINGS([maximum])
+GNOME_MAINTAINER_MODE_DEFINES
+
 dnl
 dnl Required headers
 dnl
diff --git a/gnome/applet/Makefile.am b/gnome/applet/Makefile.am
index b8e6295f4..7bea050d3 100644
--- a/gnome/applet/Makefile.am
+++ b/gnome/applet/Makefile.am
@@ -24,11 +24,8 @@ nm_applet_CPPFLAGS =									\
 	-DAUTOSTARTDIR=\""$(datadir)/gnome/autostart"\"			\
 	-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"	\
 	-DDBUS_API_SUBJECT_TO_CHANGE							\
-	-DG_DISABLE_DEPRECATED								\
-	-DGDK_DISABLE_DEPRECATED								\
-	-DGNOME_DISABLE_DEPRECATED							\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"					\
-	-DVERSION=\"$(VERSION)\"								\
+	$(DISABLE_DEPRECATED)	\
 	$(NULL)
 
 if WITH_NOTIFY