Merge 8.6

8 files changed, 48 insertions, 20 deletions

diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index 8ad2c80..51c422e 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -13,6 +13,7 @@
 *.sl
 *.so
 */Makefile
+*/autom4te.cache
 */config.cache
 */config.log
 */config.status
@@ -42,10 +43,19 @@ libtommath/etc/*
 libtommath/demo/*
 libtommath/*.out
 libtommath/*.tex
+macosx/configure
 unix/autoMkindex.tcl
 unix/dltest.marker
+unix/dltest/*.bundle
+unix/dltest/*.dll
+unix/dltest/*.dylib
+unix/dltest/*.o
+unix/dltest/*.sl
+unix/dltest/*.so
 unix/tcl.pc
 unix/tclIndex
+unix/Tcl-Info.plist
+unix/Tclsh-Info.plist
 unix/pkgs/*
 win/Debug*
 win/Release*
diff --git a/.fossil-settings/manifest b/.fossil-settings/manifest
new file mode 100644
index 0000000..4ae8ef0
--- /dev/null
+++ b/.fossil-settings/manifest
@@ -0,0 +1 @@
+u
diff --git a/.gitignore b/.gitignore
index acaff0f..701419b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.a
+*.bundle
 *.dll
 *.dylib
 *.exe
@@ -10,11 +11,17 @@
 *.res
 *.sl
 *.so
-*/Makefile
-*/config.cache
-*/config.log
-*/config.status
-*/config.status.lineno
+.fslckout
+Makefile
+Tcl-Info.plist
+autom4te.cache
+config.cache
+config.log
+config.status
+config.status.lineno
+html
+manifest.uuid
+_FOSSIL_
 */tclConfig.sh
 */tclsh*
 */tcltest*
@@ -22,9 +29,6 @@
 */version.vc
 */libtcl.vfs
 */libtcl_*.zip
-.fslckout
-_FOSSIL_
-html
 libtommath/bn.ilg
 libtommath/bn.ind
 libtommath/pretty.build
@@ -43,6 +47,7 @@ libtommath/etc/*
 libtommath/demo/*
 libtommath/*.out
 libtommath/*.tex
+macosx/configure
 unix/autoMkindex.tcl
 unix/dltest.marker
 unix/tcl.pc
diff --git a/compat/strstr.c b/compat/strstr.c
index 206dca9..35386d0 100644
--- a/compat/strstr.c
+++ b/compat/strstr.c
@@ -36,10 +36,10 @@
 
 char *
 strstr(
-    char *string,		/* String to search. */
-    char *substring)		/* Substring to try to find in string. */
+    const char *string,		/* String to search. */
+    const char *substring)		/* Substring to try to find in string. */
 {
-    char *a, *b;
+    const char *a, *b;
 
     /*
      * First scan quickly through the two strings looking for a
@@ -49,7 +49,7 @@ strstr(
 
     b = substring;
     if (*b == 0) {
-	return string;
+	return (char *)string;
     }
     for ( ; *string != 0; string += 1) {
 	if (*string != *b) {
@@ -58,7 +58,7 @@ strstr(
 	a = string;
 	while (1) {
 	    if (*b == 0) {
-		return string;
+		return (char *)string;
 	    }
 	    if (*a++ != *b++) {
 		break;
diff --git a/unix/Makefile.in b/unix/Makefile.in
index e6a7705..21967bd 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2227,10 +2227,15 @@ $(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure
 $(UNIX_DIR)/tclConfig.h.in: $(MAC_OSX_DIR)/configure
 	cd $(MAC_OSX_DIR); autoheader; touch $@
 
-dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in \
-		$(MAC_OSX_DIR)/configure genstubs dist-packages ${NATIVE_TCLSH}
+$(TOP_DIR)/manifest.uuid:
+	printf "git." >$(TOP_DIR)/manifest.uuid
+	git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid
+
+dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in genstubs \
+		$(MAC_OSX_DIR)/configure $(TOP_DIR)/manifest.uuid dist-packages ${NATIVE_TCLSH}
 	rm -rf $(DISTDIR)
 	mkdir -p $(DISTDIR)/unix
+	cp -p $(TOP_DIR)/manifest.uuid $(DISTDIR)
 	cp -p $(UNIX_DIR)/*.[ch] $(DISTDIR)/unix
 	cp $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix
 	chmod 664 $(DISTDIR)/unix/Makefile.in
diff --git a/unix/configure b/unix/configure
index 94de17f..d3a4856 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8894,8 +8894,10 @@ else
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <string.h>
 int main() {
-    extern int strstr();
     exit(strstr("\0test", "test") ? 1 : 0);
 }
 _ACEOF
@@ -8953,8 +8955,10 @@ else
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <string.h>
 int main() {
-    extern int strtoul();
     char *term, *string = "0";
     exit(strtoul(string,&term,0) != 0 || term != string+1);
 }
@@ -9511,6 +9515,7 @@ else
 /* end confdefs.h.  */
 
 	#include <stdlib.h>
+	#include <string.h>
 	#define OURVAR "havecopy=yes"
 	int main (int argc, char *argv[])
 	{
diff --git a/unix/configure.ac b/unix/configure.ac
index dd28f9a..d480fb7 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -388,7 +388,6 @@ AC_CHECK_FUNC(memmove, , [
 #--------------------------------------------------------------------
 
 SC_TCL_CHECK_BROKEN_FUNC(strstr, [
-    extern int strstr();
     exit(strstr("\0test", "test") ? 1 : 0);
 ])
 
@@ -399,7 +398,6 @@ SC_TCL_CHECK_BROKEN_FUNC(strstr, [
 #--------------------------------------------------------------------
 
 SC_TCL_CHECK_BROKEN_FUNC(strtoul, [
-    extern int strtoul();
     char *term, *string = "0";
     exit(strtoul(string,&term,0) != 0 || term != string+1);
 ])
@@ -545,6 +543,7 @@ fi
 AC_CACHE_CHECK([for a putenv() that copies the buffer], tcl_cv_putenv_copy, [
     AC_TRY_RUN([
 	#include <stdlib.h>
+	#include <string.h>
 	#define OURVAR "havecopy=yes"
 	int main (int argc, char *argv[])
 	{
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index aed464f..056cf1f 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2477,7 +2477,10 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[
     AC_CHECK_FUNC($1, tcl_ok=1, tcl_ok=0)
     if test ["$tcl_ok"] = 1; then
 	AC_CACHE_CHECK([proper ]$1[ implementation], [tcl_cv_]$1[_unbroken],
-	    AC_TRY_RUN([[int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok,
+	    AC_TRY_RUN([[
+#include <stdlib.h>
+#include <string.h>
+int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok,
 		[tcl_cv_]$1[_unbroken]=broken,[tcl_cv_]$1[_unbroken]=unknown))
 	if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then
 	    tcl_ok=1