* acgeneral.m4 (AC_INCLUDES_DEFAULT): Force the newline to avoid

bad surprises.
Reported by Jim.

diff --git a/ChangeLog b/ChangeLog
index 7bc65b8797d5c130eb72937a4b86d96ec8cf75e5..13a27de99e8484decde3b70015bf155f4a6ce41e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-18  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (AC_INCLUDES_DEFAULT): Force the newline to avoid
+       bad surprises.
+       Reported by Jim.
+
 2001-01-18  Akim Demaille  <akim@epita.fr>
 
        Require a perfect divert push/pop balance.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 35348ba9e1b3ed8447f8a2efbad66a9e86071f00..dc2cebf5cc4999be3f3137a342cc8e49591a932e 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2306,8 +2306,15 @@ AC_CHECK_HEADERS(stdlib.h string.h memory.h strings.h inttypes.h unistd.h)
 # -------------------------------
 # If INCLUDES is empty, expand in default includes, otherwise in
 # INCLUDES.
+# In most cases INCLUDES is not double quoted as it should, and if
+# for instance INCLUDES = `#include <stdio.h>' then unless we force
+# a newline, the hash will swallow the closing paren etc. etc.
+# The usual failure.
+# Take no risk: for the newline.
 AC_DEFUN([AC_INCLUDES_DEFAULT],
-[m4_default([$1], [AC_REQUIRE([_AC_INCLUDES_DEFAULT_REQUIREMENTS])dnl
+[m4_ifval([$1], [$1
+],
+          [AC_REQUIRE([_AC_INCLUDES_DEFAULT_REQUIREMENTS])dnl
 $ac_includes_default])])
 
 

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 35348ba9e1b3ed8447f8a2efbad66a9e86071f00..dc2cebf5cc4999be3f3137a342cc8e49591a932e 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2306,8 +2306,15 @@ AC_CHECK_HEADERS(stdlib.h string.h memory.h strings.h inttypes.h unistd.h)
 # -------------------------------
 # If INCLUDES is empty, expand in default includes, otherwise in
 # INCLUDES.
+# In most cases INCLUDES is not double quoted as it should, and if
+# for instance INCLUDES = `#include <stdio.h>' then unless we force
+# a newline, the hash will swallow the closing paren etc. etc.
+# The usual failure.
+# Take no risk: for the newline.
 AC_DEFUN([AC_INCLUDES_DEFAULT],
-[m4_default([$1], [AC_REQUIRE([_AC_INCLUDES_DEFAULT_REQUIREMENTS])dnl
+[m4_ifval([$1], [$1
+],
+          [AC_REQUIRE([_AC_INCLUDES_DEFAULT_REQUIREMENTS])dnl
 $ac_includes_default])])