summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorferrieux <ferrieux@users.sourceforge.net>2012-05-10 21:43:30 (GMT)
committerferrieux <ferrieux@users.sourceforge.net>2012-05-10 21:43:30 (GMT)
commit25566ea94ed5e5ecc53df06bd7e0f8f1349f001c (patch)
treefb035c39d68cd191cb69f4b9c50524f3b1be6b1b
parent2454e655e137710903fe501014aa0de7550297cc (diff)
downloadtcl-25566ea94ed5e5ecc53df06bd7e0f8f1349f001c.zip
tcl-25566ea94ed5e5ecc53df06bd7e0f8f1349f001c.tar.gz
tcl-25566ea94ed5e5ecc53df06bd7e0f8f1349f001c.tar.bz2
[Bug 2812981]: Clean up bundled packages' build directory from within Tcl's ./configure, to avoid stale configuration.
-rw-r--r--ChangeLog6
-rwxr-xr-xunix/configure5
-rw-r--r--unix/configure.in5
-rwxr-xr-xwin/configure5
-rw-r--r--win/configure.in5
5 files changed, 26 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b02b23..bd13cb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-10 Alexandre Ferrieux <ferrieux@users.sourceforge.net>
+
+ * {win,unix}/configure{,.in} [Bug 2812981]: Clean up bundled
+ packages' build directory from within Tcl's ./configure, to avoid
+ stale configuration.
+
2012-05-09 Andreas Kupries <andreask@activestate.com>
* generic/tclIORChan.c [Bug 3522560]: Fixed the crash, enabled the
diff --git a/unix/configure b/unix/configure
index 8f25c08..1151497 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1353,6 +1353,11 @@ if test -r "$cache_file" -a -f "$cache_file"; then
fi
#------------------------------------------------------------------------
+# Empty slate for bundled packages, to avoid stale configuration
+#------------------------------------------------------------------------
+rm -Rf pkgs
+
+#------------------------------------------------------------------------
# Handle the --prefix=... option
#------------------------------------------------------------------------
diff --git a/unix/configure.in b/unix/configure.in
index 066a84f..4fc93dd 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -43,6 +43,11 @@ if test -r "$cache_file" -a -f "$cache_file"; then
fi
#------------------------------------------------------------------------
+# Empty slate for bundled packages, to avoid stale configuration
+#------------------------------------------------------------------------
+rm -Rf pkgs
+
+#------------------------------------------------------------------------
# Handle the --prefix=... option
#------------------------------------------------------------------------
diff --git a/win/configure b/win/configure
index f3bd0d9..6673ecb 100755
--- a/win/configure
+++ b/win/configure
@@ -1329,6 +1329,11 @@ REGVER=$TCL_REG_MAJOR_VERSION$TCL_REG_MINOR_VERSION
PKG_CFG_ARGS=$@
#------------------------------------------------------------------------
+# Empty slate for bundled packages, to avoid stale configuration
+#------------------------------------------------------------------------
+rm -Rf pkgs
+
+#------------------------------------------------------------------------
# Handle the --prefix=... option
#------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index 0ed8f89..1bab810 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -32,6 +32,11 @@ REGVER=$TCL_REG_MAJOR_VERSION$TCL_REG_MINOR_VERSION
PKG_CFG_ARGS=$@
#------------------------------------------------------------------------
+# Empty slate for bundled packages, to avoid stale configuration
+#------------------------------------------------------------------------
+rm -Rf pkgs
+
+#------------------------------------------------------------------------
# Handle the --prefix=... option
#------------------------------------------------------------------------