Clean up g{lib,io}mmconfig.h.in templates

* glib/glibmmconfig.h.in: Rewrite, copying large chunks from
the autoheader-generated config.h.in template.
* gio/giommconfig.h.in: Remove everything that belongs to glibmm
and include glibmmconfig.h.

3 files changed, 98 insertions, 102 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a1bf32f..ee7a6ee2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-08-16  Daniel Elstner  <daniel.kitta@gmail.com>
 
+	Clean up g{lib,io}mmconfig.h.in templates
+
+	* glib/glibmmconfig.h.in: Rewrite, copying large chunks from
+	the autoheader-generated config.h.in template.
+	* gio/giommconfig.h.in: Remove everything that belongs to glibmm
+	and include glibmmconfig.h.
+
+2009-08-16  Daniel Elstner  <daniel.kitta@gmail.com>
+
 	Set GTHREAD_LIBS to the full --libs value again
 
 	* configure.ac (GTHREAD_LIBS): Go back to pkg-config --libs
diff --git a/gio/giommconfig.h.in b/gio/giommconfig.h.in
index 6bf690f5..7c5e76b9 100644
--- a/gio/giommconfig.h.in
+++ b/gio/giommconfig.h.in
@@ -1,90 +1,37 @@
 #ifndef _GIOMM_CONFIG_H
-#define _GIOMM_CONFIG_H 1
+#define _GIOMM_CONFIG_H
 
-/* version numbers */
+#include <glibmmconfig.h>
+
+/* Major version number of giomm. */
 #undef GIOMM_MAJOR_VERSION
-#undef GIOMM_MINOR_VERSION
+
+/* Micro version number of giomm. */
 #undef GIOMM_MICRO_VERSION
 
-// detect common platforms
-#if defined(_WIN32)
-// Win32 compilers have a lot of varation
-#if defined(_MSC_VER)
-#define GIOMM_MSC
-#define GIOMM_WIN32
-#define GIOMM_DLL
-#elif defined(__CYGWIN__)
-#define GIOMM_CONFIGURE
-#elif defined(__MINGW32__)
-#define GIOMM_WIN32
-#define GIOMM_CONFIGURE
-#else
-//AIX clR compiler complains about this even though it doesn't get this far:
-//#warning "Unknown architecture (send me gcc --dumpspecs or equiv)"
-#endif
-#else
-#define GIOMM_CONFIGURE
-#endif /* _WIN32 */
+/* Minor version number of giomm. */
+#undef GIOMM_MINOR_VERSION
 
-#ifdef GIOMM_CONFIGURE
-/* compiler feature tests that are used during compile time and run-time
-   by gtk-- only. tests used by gdk-- and gtk-- should go into
-   gdk--config.h.in */
+/* Define if giomm is built as a static library */
 #undef GIOMM_STATIC_LIB
-#undef GIOMM_CXX_HAVE_MUTABLE
-#undef GIOMM_CXX_HAVE_NAMESPACES
-//#undef GIOMM_CXX_GAUB
-//#undef GIOMM_CXX_AMBIGUOUS_TEMPLATES
-#undef GIOMM_HAVE_NAMESPACE_STD
-#undef GIOMM_HAVE_STD_ITERATOR_TRAITS
-#undef GIOMM_HAVE_SUN_REVERSE_ITERATOR
-#undef GIOMM_HAVE_TEMPLATE_SEQUENCE_CTORS
-#undef GIOMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS
-#undef GIOMM_COMPILER_SUN_FORTE
-#undef GIOMM_DEBUG_REFCOUNTING
-#undef GIOMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION
-#undef GIOMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS
-#undef GIOMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC
-#undef GIOMM_HAVE_ALLOWS_STATIC_INLINE_NPOS
-#endif
-
-#ifdef GIOMM_MSC
-  #define GIOMM_CXX_HAVE_MUTABLE 1
-  #define GIOMM_CXX_HAVE_NAMESPACES 1
-  #define GIOMM_HAVE_NAMESPACE_STD 1
-  #define GIOMM_HAVE_STD_ITERATOR_TRAITS 1
-  #define GIOMM_HAVE_TEMPLATE_SEQUENCE_CTORS 2
-  #define GIOMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1
-  #define GIOMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1
-  #define GIOMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1
-  #define GIOMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1
-  #pragma warning (disable: 4786 4355 4800 4181)
-#endif
-
-#ifndef GIOMM_HAVE_NAMESPACE_STD
-#  define GIOMM_USING_STD(Symbol) namespace std { using ::Symbol; }
-#else
-#  define GIOMM_USING_STD(Symbol) /* empty */
-#endif
 
 // Enable DLL-specific stuff only when not building a static library
 #if !defined(__CYGWIN__) && defined(__MINGW32__) && !defined(GIOMM_STATIC_LIB)
-  #define GIOMM_DLL
+# define GIOMM_DLL 1
 #endif
 
 #ifdef GIOMM_DLL
-  #if defined(GIOMM_BUILD) && defined(_WINDLL)
-    /* Do not dllexport as it is handled by gendef on MSVC */
-    #define GIOMM_API 
-  #elif !defined(GIOMM_BUILD)
-    #define GIOMM_API __declspec(dllimport)
-  #else
-    /* Build a static library */
-    #define GIOMM_API
-  #endif /* GIOMM_BUILD - _WINDLL */
+# if defined(GIOMM_BUILD) && defined(_WINDLL)
+   /* Do not dllexport as it is handled by gendef on MSVC */
+#  define GIOMM_API
+# elif !defined(GIOMM_BUILD)
+#  define GIOMM_API __declspec(dllimport)
+# else
+   /* Build a static library */
+#  define GIOMM_API
+# endif /* GIOMM_BUILD - _WINDLL */
 #else
-  #define GIOMM_API
+# define GIOMM_API
 #endif /* GIOMM_DLL */
 
 #endif /* _GIOMM_CONFIG_H */
-
diff --git a/glib/glibmmconfig.h.in b/glib/glibmmconfig.h.in
index eff6fb37..502dccb3 100644
--- a/glib/glibmmconfig.h.in
+++ b/glib/glibmmconfig.h.in
@@ -1,15 +1,6 @@
-/*
- * @configure_input@
- */
 #ifndef _GLIBMM_CONFIG_H
-#define _GLIBMM_CONFIG_H 1
+#define _GLIBMM_CONFIG_H
 
-/* version numbers */
-#undef GLIBMM_MAJOR_VERSION
-#undef GLIBMM_MINOR_VERSION
-#undef GLIBMM_MICRO_VERSION
-
-/* detect common platforms */
 #ifdef _WIN32
   /* Win32 compilers have a lot of varation */
 # if defined(_MSC_VER)
@@ -30,32 +21,81 @@
 #endif /* _WIN32 */
 
 #ifdef GLIBMM_CONFIGURE
-#undef GLIBMM_STATIC_LIB
-#undef GLIBMM_CXX_HAVE_MUTABLE
-#undef GLIBMM_CXX_HAVE_NAMESPACES
-#undef GLIBMM_HAVE_WIDE_STREAM
-/*#undef GLIBMM_CXX_GAUB*/
-/*#undef GLIBMM_CXX_AMBIGUOUS_TEMPLATES*/
-#undef GLIBMM_HAVE_STD_ITERATOR_TRAITS
-#undef GLIBMM_HAVE_SUN_REVERSE_ITERATOR
-#undef GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS
-#undef GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS
-#undef GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
-#undef GLIBMM_COMPILER_SUN_FORTE
-#undef GLIBMM_DEBUG_REFCOUNTING
-#undef GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION
+
+/* Define if extern "C" and extern "C++" function pointers are compatible. */
 #undef GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS
+
+/* Define if non-instantiated templates may dynamic_cast<> to an undefined
+   type. */
+#undef GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION
+
+/* Define if the compiler honors namespaces inside extern "C" blocks. */
 #undef GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC
+
+/* Defined when the SUN Forte C++ compiler is being used. */
+#undef GLIBMM_COMPILER_SUN_FORTE
+
+/* Defined when the --enable-debug-refcounting configure argument was given */
+#undef GLIBMM_DEBUG_REFCOUNTING
+
+/* Defined when the --enable-api-default-signal-handlers configure argument
+   was given */
+#undef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+/* Defined when the --enable-api-exceptions configure argument was given */
+#undef GLIBMM_EXCEPTIONS_ENABLED
+
+/* Defined if a static member variable may be initialized inline to
+   std::string::npos */
 #undef GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS
+
+/* Defined when time_t is not equivalent to gint32, meaning that it can be
+   used for a method overload */
+#undef GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
+
+/* Define if the compiler disambiguates template specializations for const and
+   non-const types. */
+#undef GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS
+
+/* Defined when the libstdc++ declares the std-namespace */
+#undef GLIBMM_HAVE_NAMESPACE_STD
+
+/* Defined if std::iterator_traits<> is standard-conforming */
+#undef GLIBMM_HAVE_STD_ITERATOR_TRAITS
+
+/* Defined if std::reverse_iterator is in Sun libCstd style */
+#undef GLIBMM_HAVE_SUN_REVERSE_ITERATOR
+
+/* Defined if the STL containers have templated sequence ctors */
+#undef GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS
+
+/* Define to 1 if wide stream is available. */
+#undef GLIBMM_HAVE_WIDE_STREAM
+
+/* Major version number of glibmm. */
+#undef GLIBMM_MAJOR_VERSION
+
+/* Define if C++ member functions may refer to member templates. */
+#undef GLIBMM_MEMBER_FUNCTIONS_MEMBER_TEMPLATES
+
+/* Micro version number of glibmm. */
+#undef GLIBMM_MICRO_VERSION
+
+/* Minor version number of glibmm. */
+#undef GLIBMM_MINOR_VERSION
+
+/* Defined when the --enable-api-properties configure argument was given */
 #undef GLIBMM_PROPERTIES_ENABLED
+
+/* Define if glibmm is built as a static library */
+#undef GLIBMM_STATIC_LIB
+
+/* Defined when the --enable-api-vfuncs configure argument was given */
 #undef GLIBMM_VFUNCS_ENABLED
-#undef GLIBMM_EXCEPTIONS_ENABLED
-#undef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
-#endif
+
+#endif /* GLIBMM_CONFIGURE */
 
 #ifdef GLIBMM_MSC
-# define GLIBMM_CXX_HAVE_MUTABLE 1
-# define GLIBMM_CXX_HAVE_NAMESPACES 1
 # define GLIBMM_HAVE_STD_ITERATOR_TRAITS 1
 # define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS 2
 # define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1