[gconf-editor] Use the standard GNOME macro to define deprecations.

[Cosimo Cecchi <cosimoc src gnome org>]

commit d81a517c49f3ccd5a29ee5bb7f6c13fe6afe41e9
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Mar 10 20:34:30 2010 +0100

    Use the standard GNOME macro to define deprecations.

 configure.in    |   14 ++------------
 src/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/configure.in b/configure.in
index a75e06e..72ea939 100644
--- a/configure.in
+++ b/configure.in
@@ -7,11 +7,6 @@ AC_CONFIG_SRCDIR([src/main.c])
 AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
 AC_CONFIG_HEADERS([config.h])
 
-if test -z "$enable_maintainer_mode"; then
-  enable_maintainer_mode=yes
-fi
-AM_MAINTAINER_MODE([enable])
-
 IT_PROG_INTLTOOL([0.35.0])
 
 AC_PROG_CC
@@ -37,12 +32,6 @@ PKG_CHECK_MODULES(GCONF_EDITOR,
 		  gtk+-2.0 >= 2.12.0
 		  dbus-glib-1)
 
-if test "$enable_maintainer_mode" = "yes"; then
-	DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
--DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
-	AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-fi
-
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 GETTEXT_PACKAGE=gconf-editor
@@ -50,9 +39,10 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [The gettext package])
 
 AM_GLIB_GNU_GETTEXT
+
+GNOME_MAINTAINER_MODE_DEFINES
 GNOME_COMMON_INIT
 GNOME_COMPILE_WARNINGS([maximum])
-GNOME_MAINTAINER_MODE_DEFINES
 
 dnl Get the GConf defaults source, and sed it to make the mandatory source.
 GCONF_DEFAULTS_SOURCE=`gconftool-2 --get-default-source`
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a3d914..641d602 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = \
 	-DLOCALEDIR=\""$(datadir)/locale"\" \
 	-DDATADIR=\""$(pkgdatadir)"\" 	\
 	-DICONDIR="\"$(pkgdatadir)/icons\"" \
-	$(DISABLE_DEPRECATED_CFLAGS) \
+	$(DISABLE_DEPRECATED) \
 	$(GCONF_EDITOR_CFLAGS) \
 	$(GCONF_EDITOR_POLKIT_CFLAGS)