diff options
| author | das <das> | 2002-09-10 09:57:42 (GMT) |
|---|---|---|
| committer | das <das> | 2002-09-10 09:57:42 (GMT) |
| commit | da6130923a43f8b2a4d9bfb93e79b0960130525a (patch) | |
| tree | 2f855788a07a1ff928ef9d837440d47d934a62bf /unix | |
| parent | 4aef9a98da255c332b47645bdebb221d2c1b6bba (diff) | |
| download | tcl-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')
| -rw-r--r-- | unix/Makefile.in | 10 | ||||
| -rwxr-xr-x | unix/configure | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 4 |
3 files changed, 8 insertions, 10 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index a8dc25b..5b5ea2f 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.115 2002/08/31 06:09:46 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.116 2002/09/10 09:57:42 das Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -228,6 +228,9 @@ TCL_LIB_FLAG = @TCL_LIB_FLAG@ TCL_EXP_FILE = @TCL_EXP_FILE@ TCL_BUILD_EXP_FILE = @TCL_BUILD_EXP_FILE@ +# support for embedded libraries on Darwin / Mac OS X +DYLIB_INSTALL_DIR = ${LIB_RUNTIME_DIR} + #---------------------------------------------------------------- # The information below is modified by the configure script when # Makefile is generated from Makefile.in. You shouldn't normally @@ -479,11 +482,6 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE} # burned into its ld search path. This keeps tcltest from # picking up an already installed version of the Tcl library. -# Resetting the LIB_RUNTIME_DIR below is required so that -# the generated tcltest executable gets the build directory -# burned into its ld search path. This keeps tcltest from -# picking up an already installed version of the Tcl library. - tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST} $(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd` diff --git a/unix/configure b/unix/configure index cea947e..f005092 100755 --- a/unix/configure +++ b/unix/configure @@ -6253,8 +6253,8 @@ fi 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" 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" |