summaryrefslogtreecommitdiffstats
path: root/unix/tcl.m4
diff options
context:
space:
mode:
authordas <das>2002-09-10 09:57:42 (GMT)
committerdas <das>2002-09-10 09:57:42 (GMT)
commitda6130923a43f8b2a4d9bfb93e79b0960130525a (patch)
tree2f855788a07a1ff928ef9d837440d47d934a62bf /unix/tcl.m4
parent4aef9a98da255c332b47645bdebb221d2c1b6bba (diff)
downloadtcl-da6130923a43f8b2a4d9bfb93e79b0960130525a.zip
tcl-da6130923a43f8b2a4d9bfb93e79b0960130525a.tar.gz
tcl-da6130923a43f8b2a4d9bfb93e79b0960130525a.tar.bz2
* unix/Makefile.in: added DYLIB_INSTALL_DIR variable for macosx
and set it to default value ${LIB_RUNTIME_DIR} * unix/tcl.m4 (Darwin): use DYLIB_INSTALL_DIR instead of LIB_RUNTIME_DIR in the -install_name argument to ld. * unix/configure: regen. * macosx/Tcl.pbproj/project.pbxproj: * macosx/Makefile: added support for building Tcl as an embedded framework, i.e. using an dyld install_name containing @executable_path/../Frameworks via the new DYLIB_INSTALL_DIR unix/Makefile variable.
Diffstat (limited to 'unix/tcl.m4')
-rw-r--r--unix/tcl.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 454fd6c..31f43a9 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1236,8 +1236,8 @@ dnl AC_CHECK_TOOL(AR, ar, :)
Rhapsody-*|Darwin-*)
SHLIB_CFLAGS="-fno-common"
SHLIB_LD="cc -dynamiclib \${LDFLAGS}"
- TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr 0xa000000"
- TK_SHLIB_LD_EXTRAS="-compatibility_version ${TK_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TK_LIB_FILE} -prebind -seg1addr 0xb000000"
+ TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_VERSION} -current_version \${VERSION} -install_name \${DYLIB_INSTALL_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr 0xa000000"
+ TK_SHLIB_LD_EXTRAS="-compatibility_version ${TK_VERSION} -current_version \${VERSION} -install_name \${DYLIB_INSTALL_DIR}/\${TK_LIB_FILE} -prebind -seg1addr 0xb000000"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".dylib"
DL_OBJS="tclLoadDyld.o"