Avoid using a glibconfig.h from glib-1.2.x or glib-1.3.x.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 49dbb34df17708e65ea46296b5c0645c76fc4da1..1e613a76f0ac8dc1b87c53840e93e94caa521644 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-09  Bruno Haible  <bruno@clisp.org>
+
+       * m4/libglib.m4 (gl_LIBGLIB): Ensure that the <glib.h> is from a glib
+       version >= 2.0.
+       Reported by Paul Eggert <eggert@cs.ucla.edu>.
+
 2007-11-07  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.17 released.

diff --git a/gnulib-local/m4/libglib.m4 b/gnulib-local/m4/libglib.m4
index 92d3afef63db4111807c9e83cbcf572ebae07737..fe533cb92f84cd29a64124a10673bb5f75a43872 100644 (file)
--- a/gnulib-local/m4/libglib.m4
+++ b/gnulib-local/m4/libglib.m4
@@ -1,5 +1,5 @@
-# libglib.m4 serial 2 (gettext-0.17)
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
+# libglib.m4 serial 3 (gettext-0.17)
+dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -35,7 +35,11 @@ AC_DEFUN([gl_LIBGLIB],
       dnl one that built the library.
       AC_LIB_LINKFLAGS_BODY([glib-2.0])
       LIBS="$gl_save_LIBS $LIBGLIB_2_0"
-      AC_TRY_LINK([#include <glib.h>],
+      AC_TRY_LINK([#include <glib.h>
+#ifndef G_BEGIN_DECLS
+error this glib.h includes a glibconfig.h from a glib version 1.x
+#endif
+],
         [g_string_new ("foo");],
         [gl_cv_libglib=yes
          gl_cv_LIBGLIB="$LIBGLIB_2_0"
@@ -44,7 +48,11 @@ AC_DEFUN([gl_LIBGLIB],
       if test "$gl_cv_libglib" != yes; then
         gl_save_CPPFLAGS="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $INCGLIB_2_0"
-        AC_TRY_LINK([#include <glib.h>],
+        AC_TRY_LINK([#include <glib.h>
+#ifndef G_BEGIN_DECLS
+error this glib.h includes a glibconfig.h from a glib version 1.x
+#endif
+],
           [g_string_new ("foo");],
           [gl_cv_libglib=yes
            gl_cv_LIBGLIB="$LIBGLIB_2_0"
@@ -56,7 +64,11 @@ AC_DEFUN([gl_LIBGLIB],
           dnl and /usr/lib/glib-2.0/include.
           if test -n "$LIBGLIB_2_0_PREFIX"; then
             CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
-            AC_TRY_LINK([#include <glib.h>],
+            AC_TRY_LINK([#include <glib.h>
+#ifndef G_BEGIN_DECLS
+error this glib.h includes a glibconfig.h from a glib version 1.x
+#endif
+],
               [g_string_new ("foo");],
               [gl_cv_libglib=yes
                gl_cv_LIBGLIB="$LIBGLIB_2_0"