diff options
| author | dgp <dgp@users.sourceforge.net> | 2019-10-28 15:32:28 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2019-10-28 15:32:28 (GMT) |
| commit | 4bcbf9fc65d2f2f1e58f47b521465452ec42ef83 (patch) | |
| tree | 8298d054d7d5981015971694af3c2f16f945f4c5 /unix | |
| parent | 6ca9f62bb55bbd123c08baf23b4d519ee7a773f6 (diff) | |
| parent | 507395df2ce580c9c0048b0f8a94c19d4d8b9dd6 (diff) | |
| download | tcl-4bcbf9fc65d2f2f1e58f47b521465452ec42ef83.zip tcl-4bcbf9fc65d2f2f1e58f47b521465452ec42ef83.tar.gz tcl-4bcbf9fc65d2f2f1e58f47b521465452ec42ef83.tar.bz2 | |
Close fork, dropping commits apparently in error.
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 480f9d5..1f5bfd4 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 17f7655..2ef70f0 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)`" |