1999-03-01 Gordon Matzigkeit <gord@trick.fig.org>

	* acgeneral.m4 (AC_OUTPUT_MAKE_DEFS): Don't require that macro
	symbols be valid C identifiers.

diff --git a/ChangeLog b/ChangeLog
index 74e4356541ab3e004b3e2330e2608df6590c7b68..e388686c5a009bef5c5ad79162dea94c8f61a545 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,11 @@
        * config.guess: Recognise HP 9000/800. Merged from the master
        FSF version of this file.
 
+1999-03-01  Gordon Matzigkeit  <gord@trick.fig.org>
+
+       * acgeneral.m4 (AC_OUTPUT_MAKE_DEFS): Don't require that macro
+       symbols be valid C identifiers.
+
 1999-02-28  Ben Elliston  <bje@cygnus.com>
 
        * acspecific.m4 (AC_FUNC_VFORK): Allow test to behave correctly

diff --git a/acgeneral.m4 b/acgeneral.m4
index 0d4f914361dc537a9ba47f27a9e6eb92f6ed7359..b496cb33c23a7e89328a3c255743b107bf3015b1 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2135,7 +2135,7 @@ dnl Using a here document instead of a string reduces the quoting nightmare.
 # Protect against Makefile macro expansion.
 cat > conftest.defs <<\EOF
 changequote(<<, >>)dnl
-s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%<<#define>> \([^     ][^     ]*\) *\(.*\)%-D\1=\2%g
 s%[    `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g
 s%\[%\\&%g
 s%\]%\\&%g

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 0d4f914361dc537a9ba47f27a9e6eb92f6ed7359..b496cb33c23a7e89328a3c255743b107bf3015b1 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2135,7 +2135,7 @@ dnl Using a here document instead of a string reduces the quoting nightmare.
 # Protect against Makefile macro expansion.
 cat > conftest.defs <<\EOF
 changequote(<<, >>)dnl
-s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%<<#define>> \([^     ][^     ]*\) *\(.*\)%-D\1=\2%g
 s%[    `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g
 s%\[%\\&%g
 s%\]%\\&%g