aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Faylor <cgf@redhat.com>2003-01-07 21:57:34 +0000
committerChristopher Faylor <cgf@gcc.gnu.org>2003-01-07 21:57:34 +0000
commitb5038cfb822f8f3881fab43d0149dd205d4ca001 (patch)
tree5ca11e72b237fd26a974739684e54f22a586e836
parent3ee04299ad0d4fefa7c303e78dbf2e985e023eb6 (diff)
downloadgcc-b5038cfb822f8f3881fab43d0149dd205d4ca001.zip
gcc-b5038cfb822f8f3881fab43d0149dd205d4ca001.tar.gz
gcc-b5038cfb822f8f3881fab43d0149dd205d4ca001.tar.bz2
* configure: Regenerate with proper autoconf 2.13.
From-SVN: r61022
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure37
2 files changed, 14 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index ba8df54..1f3d23b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
2003-01-07 Christopher Faylor <cgf@redhat.com>
+ * configure: Regenerate with proper autoconf 2.13.
+
+2003-01-07 Christopher Faylor <cgf@redhat.com>
+
* configure.in: Add AC_PREREQ for consistency.
+ * configure: Regenerate.
2003-01-06 Andrew Cagney <ac131313@redhat.com>
diff --git a/configure b/configure
index baf6d1d..55b400d 100755
--- a/configure
+++ b/configure
@@ -3980,34 +3980,15 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section. Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
-t quote
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output. A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
+cat > conftest.defs <<\EOF
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+EOF
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+rm -f conftest.defs
# Without the "./", some shells look in PATH for config.status.