Add check whether #include_next also works after #include directives.

diff --git a/ChangeLog b/ChangeLog
index 8109f7b2a1b4717b4a7de15d6bace96f93713899..e7a4333b557b3c432243e1e1587c27e48440149a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-04  Albert Chin  <bug-gnulib@mlists.thewrittenword.com>
+            Bruno Haible  <bruno@clisp.org>
+
+       * m4/include_next.m4 (gl_INCLUDE_NEXT): Add check whether #include_next
+       also works after #include directives.
+
 2008-09-04  Ondřej Vašík  <ovasik@redhat.com>
 
        getdate.y: reject an out-of-range timezone value

diff --git a/m4/include_next.m4 b/m4/include_next.m4
index 08c63dbc2c667988532f062e38adde8dc5c69dac..b6e4d3ae7a92c2e1a7c83b5325a31fadf25f8ff7 100644 (file)
--- a/m4/include_next.m4
+++ b/m4/include_next.m4
@@ -1,4 +1,4 @@
-# include_next.m4 serial 7
+# include_next.m4 serial 8
 dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -28,8 +28,12 @@ AC_DEFUN([gl_INCLUDE_NEXT],
     [gl_cv_have_include_next],
     [rm -rf conftestd1 conftestd2
      mkdir conftestd1 conftestd2
+     dnl The include of <stdio.h> is because IBM C 9.0 on AIX 6.1 supports
+     dnl include_next when used as first preprocessor directive in a file,
+     dnl but not when preceded by another include directive.
      cat <<EOF > conftestd1/conftest.h
 #define DEFINED_IN_CONFTESTD1
+#include <stdio.h>
 #include_next <conftest.h>
 #ifdef DEFINED_IN_CONFTESTD2
 int foo;