diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-05-15 07:52:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-05-15 07:52:44 (GMT) |
| commit | cdb0df2ccb91f62869444148376ce5889bd755b3 (patch) | |
| tree | 344e9af8fd3e40cffb907afbb8ef7c64e5e4d154 /unix/tcl.m4 | |
| parent | 8dc126139592299e8d3c5a29e840a9711ca540d1 (diff) | |
| download | tk-cdb0df2ccb91f62869444148376ce5889bd755b3.zip tk-cdb0df2ccb91f62869444148376ce5889bd755b3.tar.gz tk-cdb0df2ccb91f62869444148376ce5889bd755b3.tar.bz2 | |
sync rules.vc and tcl.m4 (both win and unix) with Tcl version
Diffstat (limited to 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 2f114d7..a206f26 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1459,10 +1459,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_SUFFIX=".dylib" DL_OBJS="tclLoadDyld.o" DL_LIBS="" - # Don't use -prebind when building for Mac OS X 10.4 or later only: - AS_IF([test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int([$]2)}'`" -lt 4 -a \ - "`echo "${CPPFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int([$]2)}'`" -lt 4], [ - LDFLAGS="$LDFLAGS -prebind"]) LDFLAGS="$LDFLAGS -headerpad_max_install_names" AC_CACHE_CHECK([if ld accepts -search_paths_first flag], tcl_cv_ld_search_paths_first, [ @@ -3014,7 +3010,7 @@ AC_DEFUN([SC_ZIPFS_SUPPORT], [ ZIP_PROG="$ac_cv_path_zip" AC_MSG_RESULT([$ZIP_PROG]) ZIP_PROG_OPTIONS="-rq" - ZIP_PROG_VFSSEARCH="." + ZIP_PROG_VFSSEARCH="*" AC_MSG_RESULT([Found INFO Zip in environment]) # Use standard arguments for zip else @@ -3022,7 +3018,7 @@ AC_DEFUN([SC_ZIPFS_SUPPORT], [ # We can use the locally distributed minizip instead ZIP_PROG="./minizip${EXEEXT_FOR_BUILD}" ZIP_PROG_OPTIONS="-o -r" - ZIP_PROG_VFSSEARCH="." + ZIP_PROG_VFSSEARCH="*" ZIP_INSTALL_OBJS="minizip${EXEEXT_FOR_BUILD}" AC_MSG_RESULT([No zip found on PATH. Building minizip]) fi |