From: Phil Edwards <pedwards@disaster.jaj.com>
Date: Fri, 9 Nov 2001 02:06:30 +0000 (+0000)
Subject: configure.in (--enable-languages): Be more permissive about syntax.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cc9a08e014bf94a61e66515f9fefd8ec3e832301;p=gcc.git

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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 83e547b008b..f0c04625f3f 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 59b659bcfef..d83836296c2 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 dfdfdcd393a..91047eb11cb 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