aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rwxr-xr-xconfigure6
-rw-r--r--configure.in6
3 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 86e5656..c033fc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-03-11 Eric Botcazou <ebotcazou@gcc.gnu.org>
+ Paolo Bonzini <bonzini@gnu.org>
+
+ PR bootstrap/14522
+ * configure.in: Cope with shell that do not support nesting
+ quotes inside quoted backquote substitutions.
+ * configure: Regenerate.
+
+2004-03-10 Andrew Pinski <pinskia@physics.uc.edu>
+
+ PR bootstrap/14522
+ * configure.in: Fix escaping of $.
+ * configure: Regenerate.
+
2004-03-11 Nathanael Nerode <neroden@gcc.gnu.org>
* configure: Regenerate.
diff --git a/configure b/configure
index b3adcc8..1669665 100755
--- a/configure
+++ b/configure
@@ -2272,13 +2272,13 @@ if test -d ${srcdir}/gcc; then
eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\" ;;
*)
new_enable_languages="$new_enable_languages,$language"
- missing_languages="`echo "$missing_languages" | sed "s/,$language,/,/"`" ;;
+ missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"` ;;
esac
;;
esac
done
- missing_languages="`echo "$missing_languages" | sed -e s/^,// -e s/,$//`"
+ missing_languages=`echo "$missing_languages" | sed -e s/^,// -e s/,\$//`
if test "x$missing_languages" != x; then
{ echo "configure: error:
The following requested languages were not found: ${missing_languages}" 1>&2; exit 1; }
@@ -2288,7 +2288,7 @@ The following requested languages were not found: ${missing_languages}" 1>&2; ex
echo The following languages will be built: ${new_enable_languages}
fi
enable_languages="$new_enable_languages"
- ac_configure_args="`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[^ ]*//' -e 's/$/ --enable-languages='"$enable_languages"/ `"
+ ac_configure_args=`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[^ ]*//' -e 's/$/ --enable-languages='"$enable_languages"/ `
fi
# Remove the entries in $skipdirs and $noconfigdirs from $configdirs and
diff --git a/configure.in b/configure.in
index 485d8f3..1cf5ada 100644
--- a/configure.in
+++ b/configure.in
@@ -1171,13 +1171,13 @@ if test -d ${srcdir}/gcc; then
eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\" ;;
*)
new_enable_languages="$new_enable_languages,$language"
- missing_languages="`echo "$missing_languages" | sed "s/,$language,/,/"`" ;;
+ missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"` ;;
esac
;;
esac
done
- missing_languages="`echo "$missing_languages" | sed -e s/^,// -e s/,$//`"
+ missing_languages=`echo "$missing_languages" | sed -e s/^,// -e s/,\$//`
if test "x$missing_languages" != x; then
AC_MSG_ERROR([
The following requested languages were not found: ${missing_languages}])
@@ -1187,7 +1187,7 @@ The following requested languages were not found: ${missing_languages}])
echo The following languages will be built: ${new_enable_languages}
fi
enable_languages="$new_enable_languages"
- ac_configure_args="`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[[^ ]]*//' -e 's/$/ --enable-languages='"$enable_languages"/ `"
+ ac_configure_args=`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[[^ ]]*//' -e 's/$/ --enable-languages='"$enable_languages"/ `
fi
# Remove the entries in $skipdirs and $noconfigdirs from $configdirs and