From 2b60b2cb39dc367d809b732b35ed9d26fe9658c0 Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <aoliva@redhat.com>
Date: Tue, 12 Dec 2000 20:28:52 +0000
Subject: configure.in: Simplify language enabling/disabling code.

* configure.in: Simplify language enabling/disabling code.
* configure: Rebuilt.
* ch/config-lang.in (target_libs): Set.
(build_by_default): Set to no.
* cp/config-lang.in (target_libs): Set.
* f/config-lang.in (target_libs): Set.
* java/config-lang.in (target_libs): Set.
* objc/config-lang.in (target_libs): Set.

From-SVN: r38207
---
 gcc/configure.in | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'gcc/configure.in')

diff --git a/gcc/configure.in b/gcc/configure.in
index b391267..518c650 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1499,23 +1499,19 @@ changequote(,)dnl
 	${srcdir}/[*]/config-lang.in) ;;
 	*)
 	  lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^ 	]*\).*$,\1,p' $lang`
+	  this_lang_libs=`sed -n -e 's,^target_libs=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^target_libs=\([^ 	]*\).*$,\1,p' $lang`
+	  build_by_default=`sed -n -e 's,^build_by_default=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^build_by_default=\([^ 	]*\).*$,\1,p' $lang`
 	  if test "x$lang_alias" = x
 	  then
 		echo "$lang doesn't set \$language." 1>&2
 		exit 1
 	  fi
-	  if test x"${enable_languages}" = xall && test x"${lang_alias}" != xCHILL; then
-	  	add_this_lang=yes
-	  else
-		case "${enable_languages}" in
-		    ${lang_alias} | "${lang_alias},"* | *",${lang_alias},"* | *",${lang_alias}" )
-			add_this_lang=yes
-			;;
-		    * )
-			add_this_lang=no
-			;;
-		esac
-	  fi
+	  case ${build_by_default},${enable_languages}, in
+	  *,$lang_alias,*) add_this_lang=yes ;;
+	  no,*) add_this_lang=no ;;
+	  *,all,*) add_this_lang=yes ;;
+	  *) add_this_lang=no ;;
+	  esac
 	  if test x"${add_this_lang}" = xyes; then
 		case $lang in
 		    ${srcdir}/ada/config-lang.in)
-- 
cgit v1.1