diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | unix/configure | 6 | ||||
| -rw-r--r-- | unix/tcl.m4 | 6 |
3 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2005-01-25 Daniel Steffen <das@users.sourceforge.net> + + * unix/tcl.m4 (Darwin): fixed bug with static build linking to + dynamic library in /usr/lib etc instead of linking to static library + earlier in search path. [Tcl Bug 956908] + Removed obsolete references to Rhapsody. + * unix/configure: autoconf-2.13 + 2005-01-19 Mo DeJong <mdejong@users.sourceforge.net> * win/tclWinChan.c (FileCloseProc): Invoke diff --git a/unix/configure b/unix/configure index 6d429bc..067be0b 100755 --- a/unix/configure +++ b/unix/configure @@ -3015,7 +3015,7 @@ rm -f conftest* ;; esac ;; - Rhapsody-*|Darwin-*) + Darwin-*) SHLIB_CFLAGS="-fno-common" SHLIB_LD="cc -dynamiclib \${LDFLAGS}" TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_VERSION} -current_version \${VERSION} -install_name \${DYLIB_INSTALL_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr 0xa000000" @@ -3025,7 +3025,7 @@ rm -f conftest* DL_OBJS="tclLoadDyld.o" PLAT_OBJS=\$\(MAC\_OSX_OBJS\) DL_LIBS="" - LDFLAGS="$LDFLAGS -prebind" + LDFLAGS="$LDFLAGS -prebind -Wl,-search_paths_first" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" CFLAGS_OPTIMIZE="-Os" @@ -3524,7 +3524,7 @@ fi ;; NetBSD-*|FreeBSD-*|OpenBSD-*) ;; - Rhapsody-*|Darwin-*) + Darwin-*) ;; RISCos-*) ;; diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 2ebb13a..155ff07 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1368,7 +1368,7 @@ dnl AC_CHECK_TOOL(AR, ar) ;; esac ;; - Rhapsody-*|Darwin-*) + Darwin-*) SHLIB_CFLAGS="-fno-common" SHLIB_LD="cc -dynamiclib \${LDFLAGS}" TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_VERSION} -current_version \${VERSION} -install_name \${DYLIB_INSTALL_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr 0xa000000" @@ -1378,7 +1378,7 @@ dnl AC_CHECK_TOOL(AR, ar) DL_OBJS="tclLoadDyld.o" PLAT_OBJS=\$\(MAC\_OSX_OBJS\) DL_LIBS="" - LDFLAGS="$LDFLAGS -prebind" + LDFLAGS="$LDFLAGS -prebind -Wl,-search_paths_first" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" CFLAGS_OPTIMIZE="-Os" @@ -1764,7 +1764,7 @@ dnl AC_CHECK_TOOL(AR, ar) ;; NetBSD-*|FreeBSD-*|OpenBSD-*) ;; - Rhapsody-*|Darwin-*) + Darwin-*) ;; RISCos-*) ;; |