* config/cygwin.cache: Prime mbstate_t.

[deliverable/binutils-gdb.git] / configure

diff --git a/configure b/configure
index 0b18cc5d17e9b19c73eeab75a14441fbc401009c..6b4d9b495623f5f4443c72b45c0809bd4a13c561 100755 (executable)
--- a/configure
+++ b/configure
@@ -1279,34 +1279,10 @@ if [ -f ${srcdir}/${Makefile_in} ] ; then
       -e "s|@oldincludedir@|${oldincludedir}|" \
       -e "s|@infodir@|${infodir}|" \
       -e "s|@mandir@|${mandir}|" \
-      -e "/^CC[        ]*=/{
-          :loop1
-          /\\\\$/ N
-          s/\\\\\\n//g
-          t loop1
-          s%^CC[       ]*=.*$%CC = ${CC}%
-          }" \
-      -e "/^CXX[       ]*=/{
-          :loop2
-          /\\\\$/ N
-          s/\\\\\\n//g
-          t loop2
-          s%^CXX[      ]*=.*$%CXX = ${CXX}%
-          }" \
-      -e "/^CFLAGS[    ]*=/{
-          :loop3
-          /\\\\$/ N
-          s/\\\\\\n//g
-          t loop3
-          s%^CFLAGS[   ]*=.*$%CFLAGS = ${CFLAGS}%
-          }" \
-      -e "/^CXXFLAGS[  ]*=/{
-          :loop4
-          /\\\\$/ N
-          s/\\\\\\n//g
-          t loop4
-          s%^CXXFLAGS[         ]*=.*$%CXXFLAGS = ${CXXFLAGS}%
-          }" \
+      -e "s|@CC@|${CC}|" \
+      -e "s|@CXX@|${CXX}|" \
+      -e "s|@CFLAGS@|${CFLAGS}|" \
+      -e "s|@CXXFLAGS@|${CXXFLAGS}|" \
       -e "s|@config_shell@|${config_shell}|" \
       -e "s|@srcdir@|${srcdir}|" \
       -e "s/\f//" \