summaryrefslogtreecommitdiffstats
path: root/unix/tcl.m4
diff options
context:
space:
mode:
authordas <das>2005-01-25 06:54:57 (GMT)
committerdas <das>2005-01-25 06:54:57 (GMT)
commitf70e69a0741a996977dba7906363d025b26988a7 (patch)
treee9e030778b2f7471f9b1878857e497e14e72458f /unix/tcl.m4
parente7249b0e543558e314e2d597b711312eb67dc365 (diff)
downloadtk-f70e69a0741a996977dba7906363d025b26988a7.zip
tk-f70e69a0741a996977dba7906363d025b26988a7.tar.gz
tk-f70e69a0741a996977dba7906363d025b26988a7.tar.bz2
* macosx/tkMacOSXInit.c (TkpInit): set tcl_interactive to 1 to show
console at startup instead of directly calling [console show]. * 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
Diffstat (limited to 'unix/tcl.m4')
-rw-r--r--unix/tcl.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index a1bdc5b..4e47554 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1329,7 +1329,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"
@@ -1339,7 +1339,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"
@@ -1725,7 +1725,7 @@ dnl AC_CHECK_TOOL(AR, ar)
;;
NetBSD-*|FreeBSD-*|OpenBSD-*)
;;
- Rhapsody-*|Darwin-*)
+ Darwin-*)
;;
RISCos-*)
;;