[gtkmm] Define *_DISABLE_DEPRECATED in config header

[Daniel Elstner <daniel src gnome org>]

commit 25dd5b84d82466e716b55f210a2f5b069d46bbd5
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Mon Aug 17 02:00:46 2009 +0200

    Define *_DISABLE_DEPRECATED in config header
    
    * configure.ac ({ATK,GDK,GTK}MM_DISABLE_DEPRECATED): Go back to
    AC_DEFINE() instead of setting DISABLE_DEPRECATED_API_CFLAGS to
    a list of -D options to pass to the compiler.
    * gdk/gdkmmconfig.h.in (GDKMM_DISABLE_DEPRECATED): Copy #undef
    statement from the config.h.in generated by autoheader.
    * gtk/gtkmmconfig.h.in (GTKMM_DISABLE_DEPRECATED): ditto.

 ChangeLog            |   11 +++++++++++
 configure.ac         |    7 +++----
 gdk/gdkmmconfig.h.in |    7 ++++---
 gtk/gtkmmconfig.h.in |    7 ++++---
 4 files changed, 22 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 69d449b..b952dbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-08-16  Daniel Elstner  <daniel kitta gmail com>
 
+	Define *_DISABLE_DEPRECATED in config header
+
+	* configure.ac ({ATK,GDK,GTK}MM_DISABLE_DEPRECATED): Go back to
+	AC_DEFINE() instead of setting DISABLE_DEPRECATED_API_CFLAGS to
+	a list of -D options to pass to the compiler.
+	* gdk/gdkmmconfig.h.in (GDKMM_DISABLE_DEPRECATED): Copy #undef
+	statement from the config.h.in generated by autoheader.
+	* gtk/gtkmmconfig.h.in (GTKMM_DISABLE_DEPRECATED): ditto.
+
+2009-08-16  Daniel Elstner  <daniel kitta gmail com>
+
 	Add missing gdkmm dependency to pkg-config file
 
 	* gtk/gtkmm-2.4.pc.in (Requires): List @GDKMM_MODULE_NAME@ as
diff --git a/configure.ac b/configure.ac
index 6281c50..2ad789a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,14 +85,13 @@ AC_ARG_ENABLE([deprecated-api],
 AS_IF([test "x$gtkmm_deprecated_api" != xno],
 [
   AC_MSG_NOTICE([[Deprecated API will be built, for backwards-compatibility.]])
-  DISABLE_DEPRECATED_API_CFLAGS=dnl
 ], [
   AC_MSG_WARN([[Deprecated API will not be built, breaking compatibility.
 Do not use this option for distribution packages.]])
-  DISABLE_DEPRECATED_API_CFLAGS='dnl
--DATKMM_DISABLE_DEPRECATED=1 -DGDKMM_DISABLE_DEPRECATED=1 -DGTKMM_DISABLE_DEPRECATED=1'dnl
+  AC_DEFINE([ATKMM_DISABLE_DEPRECATED], [1], [Define to omit deprecated API from atkmm.])
+  AC_DEFINE([GDKMM_DISABLE_DEPRECATED], [1], [Define to omit deprecated API from gdkmm.])
+  AC_DEFINE([GTKMM_DISABLE_DEPRECATED], [1], [Define to omit deprecated API from gtkmm.])
 ])
-AC_SUBST([DISABLE_DEPRECATED_API_CFLAGS])
 AM_CONDITIONAL([DISABLE_DEPRECATED_API], [test "x$gtkmm_deprecated_api" = xno])
 
 # Offer the ability to omit some API from the library, to reduce the code size.
diff --git a/gdk/gdkmmconfig.h.in b/gdk/gdkmmconfig.h.in
index 8e5fdab..db0076f 100644
--- a/gdk/gdkmmconfig.h.in
+++ b/gdk/gdkmmconfig.h.in
@@ -1,8 +1,9 @@
 #ifndef _GDKMM_CONFIG_H
-#define _GDKMM_CONFIG_H 1
+#define _GDKMM_CONFIG_H
 
-#include <glibmmconfig.h>
+#include <pangommconfig.h>
 
+/* Define to omit deprecated API from gdkmm. */
 #undef GDKMM_DISABLE_DEPRECATED
 
 /* Major version number of gdkmm. */
@@ -14,4 +15,4 @@
 /* Minor version number of gdkmm. */
 #undef GDKMM_MINOR_VERSION
 
-#endif /* _GDKMM_CONFIG_H */
+#endif /* !_GDKMM_CONFIG_H */
diff --git a/gtk/gtkmmconfig.h.in b/gtk/gtkmmconfig.h.in
index 4630fb3..9975f57 100644
--- a/gtk/gtkmmconfig.h.in
+++ b/gtk/gtkmmconfig.h.in
@@ -6,6 +6,9 @@
 /* Defined when the --enable-api-atkmm configure argument was given */
 #undef GTKMM_ATKMM_ENABLED
 
+/* Define to omit deprecated API from gtkmm. */
+#undef GTKMM_DISABLE_DEPRECATED
+
 /* Defined when the --enable-maemo-extensions configure argument was given */
 #undef GTKMM_MAEMO_EXTENSIONS_ENABLED
 
@@ -40,6 +43,4 @@
 # define GTKMM_API
 #endif /* GTKMM_DLL */
 
-#undef GTKMM_DISABLE_DEPRECATED
-
-#endif /* _GTKMM_CONFIG_H */
+#endif /* !_GTKMM_CONFIG_H */