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.

From-SVN: r46869

diff --git a/ChangeLog b/ChangeLog
index ef287de5ee171afc53add7e944afecb64901787b..032921023ed89ebe8b1fb123a4d8cdcec014974b 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-08  Geoffrey Keating  <geoffk@redhat.com>
 
        * config.sub: Import from master sources, rev. 1.230.

diff --git a/configure.in b/configure.in
index 26fd4e24e60c42f81f317a94739269ff180c4ba8..d6e62aeeeda6e5211a7fe5a278adc0c0a2a0e53c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1033,18 +1033,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.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/,$//'`
 
 # 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