PR 11238

        * configure.ac: Delete config.cache files in sub-directories when
        deleting Makefiles.
        * configure: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 6d130d2f6343af36b5e113b2ea40daf943c4e409..6aac96e9d56aa2d00579e8f04d4c6c9ef239d658 100644 (file)
--- 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-15  Nick Clifton  <nickc@redhat.com>
 
        * configure.ac: Sync from gcc.

diff --git a/configure b/configure
index fd6529879246427c8158d60007122a1da0d09da3..1f58ba30b00ba7a16b3634c5e030aa8f41dfd49f 100755 (executable)
--- 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 346416673393274567c50f8c787dd05f9643292c..371b6e2bc5be4340d3972c9f6b6cbc2945e83dae 100644 (file)
--- 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