re PR c++/11238 (A constructor with exception handler rethrows the exception to the...

        PR 11238
        * Makefile.tpl (local-distclean): Also remove config.cache files in
        sub-directories as there may not be Makefiles present in the
        sub-directories.
        * Makefile.in: Regenerate.
        * configure.ac: Revert previous delta.
        * configure: Regenerate.

From-SVN: r156826

diff --git a/ChangeLog b/ChangeLog
index f10582a329305217fac2a245dfba9ee5569e97ca..1f030902afacd1d8431a4c5f1f8abdfbf616d3b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-17  Nick Clifton  <nickc@redhat.com>
+
+       PR 11238
+       * Makefile.tpl (local-distclean): Also remove config.cache files in
+       sub-directories as there may not be Makefiles present in the
+       sub-directories.
+       * Makefile.in: Regenerate.
+       * configure.ac: Revert previous delta.
+       * configure: Regenerate.
+
 2010-02-15  Nick Clifton  <nickc@redhat.com>
 
        PR 11238

diff --git a/Makefile.in b/Makefile.in
index e34d71bfa584d3c9dd125ae56ff1d4d498e6f275..2f96521a54111d10724a999bda21f64151ca2225 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2658,6 +2658,7 @@ local-distclean:
        -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
        -rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
        -rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
+       -find . -name config.cache -delete \; 2>/dev/null
 
 local-maintainer-clean:
        @echo "This command is intended for maintainers to use;"

diff --git a/Makefile.tpl b/Makefile.tpl
index 889c040c5b2c3879fe5078497884fb83a3d39bfb..37317bcaf88aed5ac55dbfa4afe041ca7f69bf9e 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -771,6 +771,7 @@ local-distclean:
        -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
        -rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
        -rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
+       -find . -name config.cache -delete \; 2>/dev/null
 
 local-maintainer-clean:
        @echo "This command is intended for maintainers to use;"

diff --git a/configure b/configure
index 1f58ba30b00ba7a16b3634c5e030aa8f41dfd49f..fd6529879246427c8158d60007122a1da0d09da3 100755 (executable)
--- a/configure
+++ b/configure
@@ -7606,12 +7606,6 @@ 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
@@ -7627,11 +7621,6 @@ 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
@@ -7646,12 +7635,6 @@ 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 371b6e2bc5be4340d3972c9f6b6cbc2945e83dae..346416673393274567c50f8c787dd05f9643292c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2710,12 +2710,6 @@ 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
@@ -2731,11 +2725,6 @@ 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
@@ -2750,12 +2739,6 @@ 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