From abb1d0886d8dbbe9df6680e83061d3a9f20a5699 Mon Sep 17 00:00:00 2001
From: nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 15 Feb 2010 10:54:09 +0000
Subject: [PATCH]         * configure.ac: Delete config.cache files in
 sub-directories when         deleting Makefiles.         * configure:
 Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156769 138bc75d-0d04-0410-961f-82ee72b054a4
---
 ChangeLog    |  7 +++++++
 configure    | 17 +++++++++++++++++
 configure.ac | 17 +++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9799bf69845..f10582a3293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-15  Nick Clifton  <nickc@redhat.com>
+
+	PR 11238
+	* configure.ac: Delete config.cache files in sub-directories when
+	deleting Makefiles.
+	* configure: Regenerate.
+
 2010-02-12  Ben Elliston  <bje@gnu.org>
 
 	* MAINTAINERS: Update my email address.
diff --git a/configure b/configure
index fd652987924..1f58ba30b00 100755
--- a/configure
+++ b/configure
@@ -7606,6 +7606,12 @@ for module in ${build_configdirs} ; do
     echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
     rm -f ${build_subdir}/${module}/Makefile
   fi
+  # PR 11238: Also remove config.cache files.
+  if test -z "${no_recursion}" \
+     && test -f ${build_subdir}/${module}/config.cache; then
+    echo 1>&2 "*** removing ${build_subdir}/${module}/config.cache to allow reconfigure"
+    rm -f ${build_subdir}/${module}/config.cache
+  fi
   extrasub_build="$extrasub_build
 /^@if build-$module\$/d
 /^@endif build-$module\$/d
@@ -7621,6 +7627,11 @@ for module in ${configdirs} ; do
 	rm -f ${file}
       fi
     done
+    # PR 11238: Also remove config.cache files.
+    if test -f ${module}/config.cache; then
+      echo 1>&2 "*** removing ${module}/config.cache to allow reconfigure"
+      rm -f ${module}/config.cache
+    fi
   fi
   extrasub_host="$extrasub_host
 /^@if $module\$/d
@@ -7635,6 +7646,12 @@ for module in ${target_configdirs} ; do
     echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
     rm -f ${target_subdir}/${module}/Makefile
   fi
+  # PR 11238: Also remove config.cache files.
+  if test -z "${no_recursion}" \
+     && test -f ${target_subdir}/${module}/config.cache; then
+    echo 1>&2 "*** removing ${target_subdir}/${module}/config.cache to allow reconfigure"
+    rm -f ${target_subdir}/${module}/config.cache
+  fi
 
   # We only bootstrap target libraries listed in bootstrap_target_libs.
   case $bootstrap_target_libs in
diff --git a/configure.ac b/configure.ac
index 34641667339..371b6e2bc5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2710,6 +2710,12 @@ for module in ${build_configdirs} ; do
     echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
     rm -f ${build_subdir}/${module}/Makefile
   fi
+  # PR 11238: Also remove config.cache files.
+  if test -z "${no_recursion}" \
+     && test -f ${build_subdir}/${module}/config.cache; then
+    echo 1>&2 "*** removing ${build_subdir}/${module}/config.cache to allow reconfigure"
+    rm -f ${build_subdir}/${module}/config.cache
+  fi
   extrasub_build="$extrasub_build
 /^@if build-$module\$/d
 /^@endif build-$module\$/d
@@ -2725,6 +2731,11 @@ for module in ${configdirs} ; do
 	rm -f ${file}
       fi
     done
+    # PR 11238: Also remove config.cache files.
+    if test -f ${module}/config.cache; then
+      echo 1>&2 "*** removing ${module}/config.cache to allow reconfigure"
+      rm -f ${module}/config.cache
+    fi
   fi
   extrasub_host="$extrasub_host
 /^@if $module\$/d
@@ -2739,6 +2750,12 @@ for module in ${target_configdirs} ; do
     echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
     rm -f ${target_subdir}/${module}/Makefile
   fi
+  # PR 11238: Also remove config.cache files.
+  if test -z "${no_recursion}" \
+     && test -f ${target_subdir}/${module}/config.cache; then
+    echo 1>&2 "*** removing ${target_subdir}/${module}/config.cache to allow reconfigure"
+    rm -f ${target_subdir}/${module}/config.cache
+  fi
 
   # We only bootstrap target libraries listed in bootstrap_target_libs.
   case $bootstrap_target_libs in
-- 
2.11.0