Correct the copyright year. It is not 2006 or 2007.

[gcc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a8fb3b79714f8cdacd8f1344807cad55b1a0cc8c..794a4191d56b2f6001385fd0f55257f0225fe1a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1763,10 +1763,13 @@ if test -d ${srcdir}/gcc; then
            new_enable_languages="${new_enable_languages}${language},"
             potential_languages="${potential_languages}${language},"
            missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"`
-           case ${boot_language} in
-             yes)
+           case "${boot_language}:,$enable_stage1_languages," in
+             yes:* | *:*,$language,* | *:*,yes, | *:*,all,)
                # Add to (comma-separated) list of stage 1 languages.
-               stage1_languages="${stage1_languages}${language},"
+               case ",$stage1_languages," in
+                 *,$language,* | ,yes, | ,all,) ;;
+                 *) stage1_languages="${stage1_languages}${language}," ;;
+               esac
                # We need to bootstrap any supporting libraries.
                bootstrap_target_libs="${bootstrap_target_libs}${target_libs},"
                ;;
@@ -2467,6 +2470,13 @@ case ",$enable_languages,:$ENABLE_BUILD_WITH_CXX:$enable_bootstrap" in
     ;;
 esac
 
+case "$enable_bootstrap:$ENABLE_GOLD: $configdirs :,$stage1_languages," in
+  yes:yes:*\ gold\ *:*,c++,*) ;;
+  yes:yes:*\ gold\ *:*)
+    AC_MSG_ERROR([in a combined tree, bootstrapping with --enable-gold requires c++ in stage1_languages])
+    ;;
+esac
+
 # Adjust the toplevel makefile according to whether bootstrap was selected.
 case $enable_bootstrap in
   yes)