diff options
| author | Phil Edwards <pedwards@disaster.jaj.com> | 2001-11-09 02:06:30 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@gcc.gnu.org> | 2001-11-08 21:06:30 -0500 |
| commit | cc9a08e014bf94a61e66515f9fefd8ec3e832301 (patch) | |
| tree | 96af005cf2f215fe378cb10b0585b97afdd439cb | |
| parent | 132e4bd7eb486133ccf99c90f54664e5d247d914 (diff) | |
| download | gcc-cc9a08e014bf94a61e66515f9fefd8ec3e832301.zip gcc-cc9a08e014bf94a61e66515f9fefd8ec3e832301.tar.gz gcc-cc9a08e014bf94a61e66515f9fefd8ec3e832301.tar.bz2 | |
configure.in (--enable-languages): Be more permissive about syntax.
* configure.in (--enable-languages): Be more permissive about
syntax. Check for empty lists better. Warn about $LANGUAGES.
* configure: Regenerated.
From-SVN: r46870
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rwxr-xr-x | gcc/configure | 14 | ||||
| -rw-r--r-- | gcc/configure.in | 12 |
3 files changed, 25 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 83e547b..f0c0462 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2001-11-08 Phil Edwards <pedwards@disaster.jaj.com> + + * configure.in (--enable-languages): Be more permissive about + syntax. Check for empty lists better. Warn about $LANGUAGES. + * configure: Regenerated. + 2001-11-08 Richard Henderson <rth@redhat.com> * dwarf2asm.c (dw2_force_const_mem): Fix typo. diff --git a/gcc/configure b/gcc/configure index 59b659b..d838362 100755 --- a/gcc/configure +++ b/gcc/configure @@ -7615,17 +7615,23 @@ fi # Look if the user specified --enable-languages="..."; if not, use # the environment variable $LANGUAGES if defined. $LANGUAGES might # go away some day. +# NB: embedded tabs in this IF block -- do not untabify if test x"${enable_languages+set}" != xset; then if test x"${LANGUAGES+set}" = xset; then - enable_languages="`echo ${LANGUAGES} | tr ' ' ','`" + enable_languages="${LANGUAGES}" + echo "configure: warning: setting LANGUAGES is deprecated, use --enable-languages instead" 1>&2 + else enable_languages=all fi else - if test x"${enable_languages}" = x; then - { echo "configure: error: --enable-languages needs at least one argument" 1>&2; exit 1; } + if test x"${enable_languages}" = x || + test x"${enable_languages}" = xyes; + then + { echo "configure: error: --enable-languages needs at least one language argument" 1>&2; exit 1; } fi fi +enable_languages=`echo "${enable_languages}" | sed -e 's/[ ,][ ,]*/,/g' -e 's/,$//'` # First scan to see if an enabled language requires some other language. # We assume that a given config-lang.in will list all the language @@ -7741,7 +7747,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:7745: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:7751: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" diff --git a/gcc/configure.in b/gcc/configure.in index dfdfdcd..91047eb 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -1722,17 +1722,23 @@ fi # Look if the user specified --enable-languages="..."; if not, use # the environment variable $LANGUAGES if defined. $LANGUAGES might # go away some day. +# NB: embedded tabs in this IF block -- do not untabify if test x"${enable_languages+set}" != xset; then if test x"${LANGUAGES+set}" = xset; then - enable_languages="`echo ${LANGUAGES} | tr ' ' ','`" + enable_languages="${LANGUAGES}" + AC_MSG_WARN([setting LANGUAGES is deprecated, use --enable-languages instead]) + else enable_languages=all fi else - if test x"${enable_languages}" = x; then - AC_MSG_ERROR([--enable-languages needs at least one argument]) + if test x"${enable_languages}" = x || + test x"${enable_languages}" = xyes; + then + AC_MSG_ERROR([--enable-languages needs at least one language argument]) fi fi +enable_languages=`echo "${enable_languages}" | sed -e 's/[[ ,]][[ ,]]*/,/g' -e 's/,$//'` # First scan to see if an enabled language requires some other language. # We assume that a given config-lang.in will list all the language |