diff options
| author | das <das> | 2002-09-10 09:59:15 (GMT) |
|---|---|---|
| committer | das <das> | 2002-09-10 09:59:15 (GMT) |
| commit | 6d12894460cf9a45380c716dd6b9c5f4f030053f (patch) | |
| tree | 92c15956be96895ae65a5ae5d75c9049ac9145db /unix/tcl.m4 | |
| parent | 742855d0d4eca7702b6023aa18ecce61b2bec00a (diff) | |
| download | tk-6d12894460cf9a45380c716dd6b9c5f4f030053f.zip tk-6d12894460cf9a45380c716dd6b9c5f4f030053f.tar.gz tk-6d12894460cf9a45380c716dd6b9c5f4f030053f.tar.bz2 | |
* unix/Makefile.in: added DYLIB_INSTALL_DIR variable for Darwin
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/Wish.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.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index fd47e68..31f43a9 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1219,6 +1219,8 @@ dnl AC_CHECK_TOOL(AR, ar, :) CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' if test "${TCL_THREADS}" = "1" ; then + # The -pthread needs to go in the CFLAGS, not LIBS + LIBS=`echo $LIBS | sed s/-pthread//` EXTRA_CFLAGS="-pthread" LDFLAGS="$LDFLAGS -pthread" fi @@ -1234,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" |