[gtkmm] Update and clean up g[dt]kmmconfig.h

[Daniel Elstner <daniel src gnome org>]

commit 5ee5684383ace2e35a29c3c6251ada7ccf7fbc8e
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sun Aug 16 23:42:45 2009 +0200

    Update and clean up g[dt]kmmconfig.h
    
    * gdk/gdkmmconfig.h.in (GDKMM_*_VERSION): Add #undef statements
    for the version number component macros.
    * gtk/gtkmmconfig.h.in: Clean up and copy #undef statements from
    the config.h.in file generated by autoheader.

 ChangeLog            |    9 +++++++
 gdk/gdkmmconfig.h.in |   10 +++++++-
 gtk/gtkmmconfig.h.in |   64 ++++++++++++++++++++-----------------------------
 3 files changed, 44 insertions(+), 39 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2cc31bb..8d6dde1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-08-16  Daniel Elstner  <daniel kitta gmail com>
 
+	Update and clean up g[dt]kmmconfig.h
+
+	* gdk/gdkmmconfig.h.in (GDKMM_*_VERSION): Add #undef statements
+	for the version number component macros.
+	* gtk/gtkmmconfig.h.in: Clean up and copy #undef statements from
+	the config.h.in file generated by autoheader.
+
+2009-08-16  Daniel Elstner  <daniel kitta gmail com>
+
 	Provide pkg-config files for uninstalled use
 
 	* atk/atkmm-1.6-uninstalled.pc.in: New pkg-config metadata file
diff --git a/gdk/gdkmmconfig.h.in b/gdk/gdkmmconfig.h.in
index 93ece3d..8e5fdab 100644
--- a/gdk/gdkmmconfig.h.in
+++ b/gdk/gdkmmconfig.h.in
@@ -5,5 +5,13 @@
 
 #undef GDKMM_DISABLE_DEPRECATED
 
-#endif /* _GDKMM_CONFIG_H */
+/* Major version number of gdkmm. */
+#undef GDKMM_MAJOR_VERSION
+
+/* Micro version number of gdkmm. */
+#undef GDKMM_MICRO_VERSION
 
+/* Minor version number of gdkmm. */
+#undef GDKMM_MINOR_VERSION
+
+#endif /* _GDKMM_CONFIG_H */
diff --git a/gtk/gtkmmconfig.h.in b/gtk/gtkmmconfig.h.in
index 983b939..4630fb3 100644
--- a/gtk/gtkmmconfig.h.in
+++ b/gtk/gtkmmconfig.h.in
@@ -1,57 +1,45 @@
 #ifndef _GTKMM_CONFIG_H
-#define _GTKMM_CONFIG_H 1
+#define _GTKMM_CONFIG_H
 
 #include <gdkmmconfig.h>
 
-/* version numbers */
-#undef GTKMM_MAJOR_VERSION
-#undef GTKMM_MINOR_VERSION
-#undef GTKMM_MICRO_VERSION
-
+/* Defined when the --enable-api-atkmm configure argument was given */
 #undef GTKMM_ATKMM_ENABLED
+
+/* Defined when the --enable-maemo-extensions configure argument was given */
 #undef GTKMM_MAEMO_EXTENSIONS_ENABLED
 
-#ifdef GLIBMM_CONFIGURE
+/* Major version number of gtkmm. */
+#undef GTKMM_MAJOR_VERSION
 
+/* Micro version number of gtkmm. */
+#undef GTKMM_MICRO_VERSION
+
+/* Minor version number of gtkmm. */
+#undef GTKMM_MINOR_VERSION
+
+/* Define when building gtkmm as a static library */
 #undef GTKMM_STATIC_LIB
 
-/* compiler feature tests that are used during compile time and run-time
-   by gtkmm only. */
-
-/* SUN Forte, AIX, and Tru64 have the problem with flockfile and
-   funlockfile - configure finds it but the compiler can not find it
-   while compiling demowindow.cc. undef HAVE_FLOCKFILE and
-   HAVE_FUNLOCKFILE for now, so that it builds on those platforms. */
-	
-#undef HAVE_FLOCKFILE
-#undef HAVE_FUNLOCKFILE
-#undef HAVE_MKFIFO
-#undef GETC_UNLOCKED
-
-#endif /* GLIBMM_CONFIGURE */
-
-// Enable DLL-specific stuff only when not building a static library
-#if !defined(__CYGWIN__) && defined(__MINGW32__) && !defined(GTKMM_STATIC_LIB)
-  #define GTKMM_DLL
-#elif defined(_MSC_VER)
-  #define GTKMM_DLL
+/* Enable DLL-specific stuff only when not building a static library */
+#if (!defined(GTKMM_STATIC_LIB) && !defined(__CYGWIN__) && defined(__MINGW32__))
+# define GTKMM_DLL 1
 #endif
 
 #ifdef GTKMM_DLL
-  #if defined(GTKMM_BUILD) && defined(_WINDLL)
-    // Do not dllexport as it is handled by gendef on MSVC
-    #define GTKMM_API 
-  #elif !defined(GTKMM_BUILD)
-    #define GTKMM_API __declspec(dllimport)
-  #else
-    /* Build a static library */
-    #define GTKMM_API
-  #endif /* GTKMM_BUILD - _WINDLL */
+# if defined(GTKMM_BUILD) && defined(_WINDLL)
+   /* Do not dllexport as it is handled by gendef on MSVC */
+#  define GTKMM_API
+# elif !defined(GTKMM_BUILD)
+#  define GTKMM_API __declspec(dllimport)
+# else
+   /* Build a static library */
+#  define GTKMM_API
+# endif /* GTKMM_BUILD - _WINDLL */
 #else
-  #define GTKMM_API
+# define GTKMM_API
 #endif /* GTKMM_DLL */
 
 #undef GTKMM_DISABLE_DEPRECATED
 
 #endif /* _GTKMM_CONFIG_H */
-