Wed Mar 13 12:49:51 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>

	* acgeneral.m4 (AC_OUTPUT_HEADER): Undo last change to $ac_dB,
	and instead change the code written into conftest.hdr.

diff --git a/acgeneral.m4 b/acgeneral.m4
index f9803a053e781c95cd899870f9414f7bbde7ce1e..22b6954ffc2b52f4c938d05530b1a44a15cd81f5 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2016,7 +2016,7 @@ define(AC_OUTPUT_HEADER,
 #
 # ac_d sets the value in "#define NAME VALUE" lines.
 ac_dA='s%^\([  ]*\)#\([        ]*define[       ][      ]*\)'
-ac_dB='\([     ]*\)[^  ]*%\1#\2'
+ac_dB='\([     ][      ]*\)[^  ]*%\1#\2'
 ac_dC='\3'
 ac_dD='%g'
 # ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
@@ -2058,7 +2058,7 @@ cat > conftest.hdr <<\EOF
 changequote(<<, >>)dnl
 s/[\\&%]/\\&/g
 s%[\\$`]%\\&%g
-s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
+s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
 s%ac_d%ac_u%gp
 s%ac_u%ac_e%gp
 changequote([, ])dnl

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index f9803a053e781c95cd899870f9414f7bbde7ce1e..22b6954ffc2b52f4c938d05530b1a44a15cd81f5 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2016,7 +2016,7 @@ define(AC_OUTPUT_HEADER,
 #
 # ac_d sets the value in "#define NAME VALUE" lines.
 ac_dA='s%^\([  ]*\)#\([        ]*define[       ][      ]*\)'
-ac_dB='\([     ]*\)[^  ]*%\1#\2'
+ac_dB='\([     ][      ]*\)[^  ]*%\1#\2'
 ac_dC='\3'
 ac_dD='%g'
 # ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
@@ -2058,7 +2058,7 @@ cat > conftest.hdr <<\EOF
 changequote(<<, >>)dnl
 s/[\\&%]/\\&/g
 s%[\\$`]%\\&%g
-s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
+s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
 s%ac_d%ac_u%gp
 s%ac_u%ac_e%gp
 changequote([, ])dnl