summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2005-04-09 10:17:16 (GMT)
committerdas <das>2005-04-09 10:17:16 (GMT)
commitfb3da981e5b8a423c14994a51c2a8583fd5efcf3 (patch)
treef79882084420bc962e7d5e704f662bf31de125ec
parent8caed04d2ca9d28a2844c6948f12cd69ac2f51bc (diff)
downloadtk-fb3da981e5b8a423c14994a51c2a8583fd5efcf3.zip
tk-fb3da981e5b8a423c14994a51c2a8583fd5efcf3.tar.gz
tk-fb3da981e5b8a423c14994a51c2a8583fd5efcf3.tar.bz2
* unix/tcl.m4 (Darwin): added -single_module linker flag to
TCL_SHLIB_LD_EXTRAS and TK_SHLIB_LD_EXTRAS. * unix/configure: autoconf-2.13
-rw-r--r--ChangeLog6
-rwxr-xr-xunix/configure4
-rw-r--r--unix/tcl.m44
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fd9c46..d12f1cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-09 Daniel Steffen <das@users.sourceforge.net>
+
+ * unix/tcl.m4 (Darwin): added -single_module linker flag to
+ TCL_SHLIB_LD_EXTRAS and TK_SHLIB_LD_EXTRAS.
+ * unix/configure: autoconf-2.13
+
2005-03-29 Jeff Hobbs <jeffh@ActiveState.com>
* win/tcl.m4, win/configure: do not require cygpath in macros to
diff --git a/unix/configure b/unix/configure
index be16e8a..e1674da 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2721,8 +2721,8 @@ rm -f conftest*
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"
- TK_SHLIB_LD_EXTRAS="-compatibility_version ${TK_VERSION} -current_version \${VERSION} -install_name \${DYLIB_INSTALL_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 -Wl,-single_module"
+ TK_SHLIB_LD_EXTRAS="-compatibility_version ${TK_VERSION} -current_version \${VERSION} -install_name \${DYLIB_INSTALL_DIR}/\${TK_LIB_FILE} -prebind -seg1addr 0xb000000 -Wl,-single_module"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".dylib"
DL_OBJS="tclLoadDyld.o"
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 92722c4..ccd9946 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1359,8 +1359,8 @@ dnl AC_CHECK_TOOL(AR, ar)
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"
- TK_SHLIB_LD_EXTRAS="-compatibility_version ${TK_VERSION} -current_version \${VERSION} -install_name \${DYLIB_INSTALL_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 -Wl,-single_module"
+ TK_SHLIB_LD_EXTRAS="-compatibility_version ${TK_VERSION} -current_version \${VERSION} -install_name \${DYLIB_INSTALL_DIR}/\${TK_LIB_FILE} -prebind -seg1addr 0xb000000 -Wl,-single_module"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".dylib"
DL_OBJS="tclLoadDyld.o"