diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 006f4d25bb2..0de635fa77d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-13  DJ Delorie  <dj@redhat.com>
+
+	* configure.in (check_languages): determine languages to check
+	* Makefile.in (check-c++): alias for check-g++
+	(check-f77): alias for check-g77
+	(CHECK_TARGETS): depend on configured languages
+
 Wed Feb 14 01:13:59 CET 2001  Jan Hubicka  <jh@suse.cz>
 
 	* i386.md (fixsfsi2, fixdfdi2): Fix previous patch again.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 4194ac8a36c..bcc27ec979a 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2775,7 +2775,11 @@ site.exp: ./config.status Makefile
 		-e '1,/^## All variables above are.*##/ d' >> site.exp
 	-@rm -f ./tmp?
 
-CHECK_TARGETS = check-gcc check-g++ check-g77 check-objc @CHECK_PO@
+CHECK_TARGETS = check-gcc @check_languages@ @CHECK_PO@
+
+check-c++ : check-g++
+check-f77 : check-g77
+check-java : 
 
 check: $(CHECK_TARGETS)
 
diff --git a/gcc/configure b/gcc/configure
index c5c9b02f717..c6ab580dbcc 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -6638,6 +6638,15 @@ do
 	fi
 done
 
+check_languages=
+for language in .. $all_languages
+do
+	if test $language != ".."
+	then
+		check_languages="$check_languages check-$language"
+	fi
+done
+
 # Since we can't use `::' targets, we link each language in
 # with a set of hooks, reached indirectly via lang.${target}.
 
@@ -6819,6 +6828,7 @@ ${CONFIG_SHELL-/bin/sh} $srcdir/configure.frag $srcdir "$subdirs" "$dep_host_xma
 
 
 
+
 
 
 # Echo that links are built
@@ -7084,6 +7094,7 @@ s%@all_stagestuff@%$all_stagestuff%g
 s%@build_exeext@%$build_exeext%g
 s%@build_install_headers_dir@%$build_install_headers_dir%g
 s%@build_xm_file_list@%$build_xm_file_list%g
+s%@check_languages@%$check_languages%g
 s%@cc_set_by_configure@%$cc_set_by_configure%g
 s%@quoted_cc_set_by_configure@%$quoted_cc_set_by_configure%g
 s%@cpp_install_dir@%$cpp_install_dir%g
diff --git a/gcc/configure.in b/gcc/configure.in
index 52207e63456..59387926084 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1675,6 +1675,15 @@ do
 	fi
 done
 
+check_languages=
+for language in .. $all_languages
+do
+	if test $language != ".."
+	then
+		check_languages="$check_languages check-$language"
+	fi
+done
+
 # Since we can't use `::' targets, we link each language in
 # with a set of hooks, reached indirectly via lang.${target}.
 
@@ -1805,6 +1814,7 @@ AC_SUBST(all_stagestuff)
 AC_SUBST(build_exeext)
 AC_SUBST(build_install_headers_dir)
 AC_SUBST(build_xm_file_list)
+AC_SUBST(check_languages)
 AC_SUBST(cc_set_by_configure)
 AC_SUBST(quoted_cc_set_by_configure)
 AC_SUBST(cpp_install_dir)