Fix sed regexp for handling CPP macros with args.

diff --git a/ChangeLog b/ChangeLog
index 250ca904f06e7af8dd8372ff930b9da6521c6d89..f22bd5c86fc9b591b8d2e87cdc5849aaffc6520a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-04  Matthew D. Langston  <langston@SLAC.Stanford.EDU>
+
+       * acgeneral.m4 (AC_OUTPUT_MAKE_DEFS): Fix sed regexp for handling
+       CPP macros with args.
+
 1999-06-03  Ben Elliston  <bje@cygnus.com>
 
        * acgeneral.m4 (AC_ACVERSION): Correct version number.

diff --git a/acgeneral.m4 b/acgeneral.m4
index eb77ae2951a499f8a8722c0dd2e541e97e55f63a..cfd0bf179da0e277b4d2b2bb304a005ab7c15f42 100644 (file)
--- 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 eb77ae2951a499f8a8722c0dd2e541e97e55f63a..cfd0bf179da0e277b4d2b2bb304a005ab7c15f42 100644 (file)
--- 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