Merge trunk into cygwin-fixes branch. Add .fossil-settings/binary-glob to squelch warnings about *.db files on Cygwin.

FossilOrigin-Name: a8328b921c5504eceacade417e16e713999eff63978caf3418fd79501590b1cb

3 files changed, 2 insertions, 53 deletions

diff --git a/tool/find_tclconfig.tcl b/tool/find_tclconfig.tcl
deleted file mode 100644
index c3d3df8ec..000000000
--- a/tool/find_tclconfig.tcl
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Run this TCL script to find and print the pathname for the tclConfig.sh
-# file.  Used by ../configure
-#
-if {[catch {
-  set libdir [tcl::pkgconfig get libdir,install]
-}]} {
-  puts stderr "tclsh too old:  does not support tcl::pkgconfig"
-  exit 1
-}
-if {![file exists $libdir]} {
-  puts stderr "tclsh reported library directory \"$libdir\" does not exist"
-  exit 1
-}
-if {![file exists $libdir/tclConfig.sh]} {
-  set n1 $libdir/tcl$::tcl_version
-  if {[file exists $n1/tclConfig.sh]} {
-    set libdir $n1
-  } else {
-    puts stderr "cannot find tclConfig.sh in either $libdir or $n1"
-    exit 1
-  }
-}
-puts $libdir
diff --git a/tool/mkautoconfamal.sh b/tool/mkautoconfamal.sh
index c26ac8c73..9ccf8b655 100644
--- a/tool/mkautoconfamal.sh
+++ b/tool/mkautoconfamal.sh
@@ -37,6 +37,8 @@ then echo "TEA version number ok"
 else echo "TEA version number mismatch.  Should be $VERSION"; exit 1
 fi
 
+
+
 # If this script is given an argument of --snapshot, then generate a
 # snapshot tarball named for the current checkout SHA hash, rather than
 # the version number.
diff --git a/tool/tclConfigShToAutoDef.sh b/tool/tclConfigShToAutoDef.sh
deleted file mode 100755
index d12657063..000000000
--- a/tool/tclConfigShToAutoDef.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# A level of indirection for use soley by the configure script
-# (auto.def).
-#
-# Expects to be passed a full path to a tclConfig.sh. It sources it
-# and emits TCL code which sets some vars which are exported by
-# tclConfig.sh.
-#
-# This script expects that the caller has already validated that the
-# file exists, is not a directory, and is readable.
-#
-# If passed no filename, or an empty one, then it emits config code
-# suitable for the "config not found" case.
-if test x = "x$1"; then
-  TCL_INCLUDE_SPEC=
-  TCL_LIB_SPEC=
-  TCL_STUB_LIB_SPEC=
-  TCL_EXEC_PREFIX=
-  TCL_VERSION=
-else
-  . "$1"
-fi
-
-echo "define TCL_INCLUDE_SPEC {$TCL_INCLUDE_SPEC} ;"
-echo "define TCL_LIB_SPEC {$TCL_LIB_SPEC} ;"
-echo "define TCL_STUB_LIB_SPEC {$TCL_STUB_LIB_SPEC} ;"
-echo "define TCL_EXEC_PREFIX {$TCL_EXEC_PREFIX} ;"
-echo "define TCL_VERSION {$TCL_VERSION} ;"