diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-28 08:37:30 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-28 08:37:30 (GMT) |
| commit | 4f6ff8445fbb1ccf15f1ba0cc7dbcbcf98de0d91 (patch) | |
| tree | 8472a3835e57245daa79e6f2c9f932e5258eadde /unix | |
| parent | 6926f5bdc9a3dcab4d1fc6bf15fd7ec9a7da4b8f (diff) | |
| parent | 1d042a78a8b9eb70829fbad5cf1c7ab7834c9c6d (diff) | |
| download | tcl-4f6ff8445fbb1ccf15f1ba0cc7dbcbcf98de0d91.zip tcl-4f6ff8445fbb1ccf15f1ba0cc7dbcbcf98de0d91.tar.gz tcl-4f6ff8445fbb1ccf15f1ba0cc7dbcbcf98de0d91.tar.bz2 | |
Close fork, and temporary remove tests/fileSystemEncoding.test, since apparently bug [bcd1004104] is not fixed yet on Windows.
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 4 | ||||
| -rw-r--r-- | unix/configure.in | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure index 1d0f261..0a56da1 100755 --- a/unix/configure +++ b/unix/configure @@ -18831,9 +18831,9 @@ VERSION=${TCL_VERSION} if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_PACKAGE_PATH" && \ - TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks" + TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl ~/Library/Frameworks /Library/Frameworks" test -z "$TCL_MODULE_PATH" && \ - TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl" + TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl" elif test "$prefix/lib" != "$libdir"; then TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" else diff --git a/unix/configure.in b/unix/configure.in index 678a7a0..11a5b5f 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -862,9 +862,9 @@ VERSION=${TCL_VERSION} if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_PACKAGE_PATH" && \ - TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks" + TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl ~/Library/Frameworks /Library/Frameworks" test -z "$TCL_MODULE_PATH" && \ - TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl" + TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl" elif test "$prefix/lib" != "$libdir"; then TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" else diff --git a/unix/tcl.m4 b/unix/tcl.m4 index f451d0e..3150973 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -77,7 +77,6 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ `ls -d /Library/Frameworks 2>/dev/null` \ `ls -d /Network/Library/Frameworks 2>/dev/null` \ - `ls -d /System/Library/Frameworks 2>/dev/null` \ ; do if test -f "$i/Tcl.framework/tclConfig.sh" ; then ac_cv_c_tclconfig="`(cd $i/Tcl.framework; pwd)`" @@ -210,7 +209,6 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ `ls -d /Library/Frameworks 2>/dev/null` \ `ls -d /Network/Library/Frameworks 2>/dev/null` \ - `ls -d /System/Library/Frameworks 2>/dev/null` \ ; do if test -f "$i/Tk.framework/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/Tk.framework; pwd)`" |