* configure.in (--enable-languages): Be more permissive about

syntax.  Check for empty lists better.  Warn about $LANGUAGES.

diff --git a/ChangeLog b/ChangeLog
index d9c69e2..14573ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2001-11-06  Hans-Peter Nilsson  <hp@bitrange.com>
 
        * Makefile.in (MAKEINFO): Use "missing" for makeinfo older than 4.0.

diff --git a/configure.in b/configure.in
index 4102e59..7b7e4bb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -976,18 +976,24 @@ 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.in: 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.in: --enable-languages needs at least one argument 1>&2
+       if test x"${enable_languages}" = x ||
+          test x"${enable_languages}" = xyes;
+       then
+               echo configure.in: --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/,$//'`
+
 subdirs=
 for lang in ${srcdir}/gcc/*/config-lang.in ..
 do