configure.in: Fix --enable-bootstrap breakage introduced in trees without gcc.

* configure.in: Fix --enable-bootstrap breakage introduced in trees without
gcc.
* configure: Regenerate.

From-SVN: r82595

ChangeLog

+2004-06-03  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Fix --enable-bootstrap breakage introduced in trees
+	without gcc.
+	* configure: Regenerate.
+
 2004-06-01  Paolo Bonzini  <bonzini@gnu.org>
 
 	* Makefile.tpl: Fix typo.

Makefile.in

@@ -27682,12 +27682,13 @@ all-gcc: configure-gcc
 @if gcc-no-bootstrap
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	cd gcc || exit 0; \
 	$(SET_LIB_PATH) \
 	$(GCC_HOST_EXPORTS) \
 	if [ -f gcc/stage_last ] ; then \
-	  (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
+	  $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap; \
 	else \
-	  (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
+	  $(MAKE) $(GCC_FLAGS_TO_PASS) all; \
 	fi
 
 # Building GCC uses some tools for rebuilding "source" files

configure.in

@@ -1730,6 +1730,31 @@ esac
 # to maintain later.  In this particular case, you just have to be careful
 # not to nest @if/@endif pairs, because configure will not warn you at all.
 
+AC_ARG_ENABLE([bootstrap],
+[  --enable-bootstrap     Enable bootstrapping [no]],,
+enable_bootstrap=no)
+if test -d ${srcdir}/gcc; then
+  case "$host:$target:$enable_bootstrap" in
+    $build:$build:yes | *:no) ;;
+    *:yes) AC_MSG_ERROR([cannot bootstrap a cross-compiler]) ;;
+    *) AC_MSG_ERROR([invalid option for --enable-bootstrap]) ;;
+  esac
+else
+  if test $enable_bootstrap = yes; then
+    AC_MSG_ERROR([cannot bootstrap without a compiler])
+  fi
+fi
+
+case "$enable_bootstrap" in
+  yes)
+    default_target=bootstrap
+    bootstrap_suffix=bootstrap ;;
+  no)
+    default_target=all
+    bootstrap_suffix=no-bootstrap ;;
+esac
+AC_SUBST(default_target)
+
 for module in ${build_modules} ; do
   if test -z "${no_recursion}" \
      && test -f ${build_subdir}/${module}/Makefile; then
@@ -1738,7 +1763,9 @@ for module in ${build_modules} ; do
   fi
   extrasub="$extrasub
 /^@if build-$module\$/d
-/^@endif build-$module\$/d"
+/^@endif build-$module\$/d
+/^@if build-$module-$bootstrap_suffix\$/d
+/^@endif build-$module-$bootstrap_suffix\$/d"
 done
 for module in ${configdirs} ; do
   if test -z "${no_recursion}" \
@@ -1748,7 +1775,9 @@ for module in ${configdirs} ; do
   fi
   extrasub="$extrasub
 /^@if $module\$/d
-/^@endif $module\$/d"
+/^@endif $module\$/d
+/^@if $module-$bootstrap_suffix\$/d
+/^@endif $module-$bootstrap_suffix\$/d"
 done
 for module in ${target_configdirs} ; do
   if test -z "${no_recursion}" \
@@ -1758,38 +1787,11 @@ for module in ${target_configdirs} ; do
   fi
   extrasub="$extrasub
 /^@if target-$module\$/d
-/^@endif target-$module\$/d"
+/^@endif target-$module\$/d
+/^@if target-$module-$bootstrap_suffix\$/d
+/^@endif target-$module-$bootstrap_suffix\$/d"
 done
 
-AC_ARG_ENABLE([bootstrap],
-[  --enable-bootstrap     Enable bootstrapping [no]],,
-enable_bootstrap=no)
-if test -d ${srcdir}/gcc; then
-  case "$host:$target:$enable_bootstrap" in
-    $build:$build:yes | *:no) ;;
-    *:yes) AC_MSG_ERROR([cannot bootstrap a cross-compiler]) ;;
-    *) AC_MSG_ERROR([invalid option for --enable-bootstrap]) ;;
-  esac
-else
-  if test $enable_bootstrap = yes; then
-    AC_MSG_ERROR([cannot bootstrap without a compiler])
-  fi
-fi
-
-case "$enable_bootstrap" in
-  yes)
-    default_target=bootstrap
-    extrasub="$extrasub
-/^@if gcc-bootstrap\$/d
-/^@endif gcc-bootstrap\$/d" ;;
-  no)
-    default_target=all
-    extrasub="$extrasub
-/^@if gcc-no-bootstrap\$/d
-/^@endif gcc-no-bootstrap\$/d" ;;
-esac
-AC_SUBST(default_target)
-
 extrasub="$extrasub
 /^@if /,/^@endif /d"