From: Matthew D. Langston Date: Wed, 9 Jun 1999 21:05:17 +0000 (+0000) Subject: Fix sed regexp for handling CPP macros with args. X-Git-Tag: exp-1999-06-18~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edd38611d8f96676f64b5a9bf2d48d45eef417be;p=thirdparty%2Fautoconf.git Fix sed regexp for handling CPP macros with args. --- diff --git a/ChangeLog b/ChangeLog index 250ca904..f22bd5c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-06-04 Matthew D. Langston + + * acgeneral.m4 (AC_OUTPUT_MAKE_DEFS): Fix sed regexp for handling + CPP macros with args. + 1999-06-03 Ben Elliston * acgeneral.m4 (AC_ACVERSION): Correct version number. diff --git a/acgeneral.m4 b/acgeneral.m4 index eb77ae29..cfd0bf17 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -2391,7 +2391,7 @@ cat > conftest.defs <<\EOF changequote(<<, >>)dnl s%^[ ]*<<#>>[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)%-D\1=\2%g t cleanup -s%^[ ]*<<#>>[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)%-D\2=\3%g +s%^[ ]*<<#>>[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)%-D\1=\2%g : cleanup s%[ `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g s%\[%\\&%g diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index eb77ae29..cfd0bf17 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -2391,7 +2391,7 @@ cat > conftest.defs <<\EOF changequote(<<, >>)dnl s%^[ ]*<<#>>[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)%-D\1=\2%g t cleanup -s%^[ ]*<<#>>[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)%-D\2=\3%g +s%^[ ]*<<#>>[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)%-D\1=\2%g : cleanup s%[ `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g s%\[%\\&%g