Split glib.h into many header files mostly according to the resp.

[platform/upstream/glib.git] / configure.in

diff --git a/configure.in b/configure.in
index 9fd4c12..79608a2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1175,8 +1175,10 @@ case "$CONFIG_OTHER" in
  * This is a generated file.  Please modify 'configure.in'
  */
 
-#ifndef GLIBCONFIG_H
-#define GLIBCONFIG_H
+#ifndef __G_LIBCONFIG_H__
+#define __G_LIBCONFIG_H__
+
+#include <gmacros.h>
 
 _______EOF
 
@@ -1189,9 +1191,6 @@ _______EOF
        if test x$glib_values_h = xyes; then
          echo '#include <values.h>' >> $outfile
        fi
-       if test x$g_mutex_header_file != x; then
-         echo '#include <'"$g_mutex_header_file"'>' >> $outfile
-       fi
        if test "$glib_header_alloca_h" = "yes"; then
          echo '#define GLIB_HAVE_ALLOCA_H' >> $outfile
        fi
@@ -1201,9 +1200,7 @@ _______EOF
 
        cat >> $outfile <<_______EOF
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define G_MINFLOAT     $glib_mf
 #define G_MAXFLOAT     $glib_Mf
@@ -1392,9 +1389,7 @@ _______EOF
 
        cat >>$outfile <<_______EOF
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* GLIBCONFIG_H */
 _______EOF