From 6bbec498e5aba91b69c9b8060266042924321d4e Mon Sep 17 00:00:00 2001 From: Eric Botcazou <ebotcazou@gcc.gnu.org> Date: Thu, 11 Mar 2004 14:41:14 +0000 Subject: [PATCH] re PR bootstrap/14522 (Bad sed command in the configure script) 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. Co-Authored-By: Paolo Bonzini <bonzini@gnu.org> From-SVN: r79325 --- ChangeLog | 8 ++++++++ configure | 6 +++--- configure.in | 6 +++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d8d96f29b97..89785e8dcb89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +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 diff --git a/configure b/configure index 4e888695d372..166966545d35 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 b0b3aad1ec54..1cf5adaac6f0 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 -- GitLab