(_AC_OUTPUT_CONFIG_STATUS): Set up traps to remove

temporaries upon exit, too, not just upon receipt of signal.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 8fec5fa9a81ce569ae850c3fcd761a4fc1b772ab..98dab703b5939c88cfdf046c4018c23f92973ee0 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -3940,7 +3940,8 @@ fi
 
 # Trap to remove the temp files.
 dnl FIXME: Should we check that there are files to remove?
-trap 'rm -fr $ac_cs_root*; exit 1' 1 2 15
+trap 'status=$?; rm -rf $ac_cs_root* && exit $status' 0
+trap 'exit $?' 1 2 13 15
 
 EOF
 ])[]dnl ifval

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 8fec5fa9a81ce569ae850c3fcd761a4fc1b772ab..98dab703b5939c88cfdf046c4018c23f92973ee0 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -3940,7 +3940,8 @@ fi
 
 # Trap to remove the temp files.
 dnl FIXME: Should we check that there are files to remove?
-trap 'rm -fr $ac_cs_root*; exit 1' 1 2 15
+trap 'status=$?; rm -rf $ac_cs_root* && exit $status' 0
+trap 'exit $?' 1 2 13 15
 
 EOF
 ])[]dnl ifval