summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2005-06-18 21:46:02 (GMT)
committerdas <das>2005-06-18 21:46:02 (GMT)
commit1b6b31dc57b749dc2f61165e4389744699ada83d (patch)
tree424c86b8e56b4fc88b3f373760c4357fe320b60d
parent269c0f37fabe9229c395ebdac5ec826438d103ec (diff)
downloadtk-1b6b31dc57b749dc2f61165e4389744699ada83d.zip
tk-1b6b31dc57b749dc2f61165e4389744699ada83d.tar.gz
tk-1b6b31dc57b749dc2f61165e4389744699ada83d.tar.bz2
* macosx/Makefile: for X11 build, add -X11 suffix to unversioned wish
symbolic link. * unix/tcl.m4 (Darwin): add -headerpad_max_install_names to LDFLAGS to ensure we can always relocate binaries with install_name_tool. * unix/configure: autoconf-2.59
-rw-r--r--ChangeLog10
-rw-r--r--macosx/Makefile6
-rwxr-xr-xunix/configure2
-rw-r--r--unix/tcl.m42
4 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d39125e..509b344 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-06-18 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/Makefile: for X11 build, add -X11 suffix to unversioned wish
+ symbolic link.
+
+ * unix/tcl.m4 (Darwin): add -headerpad_max_install_names to LDFLAGS to
+ ensure we can always relocate binaries with install_name_tool.
+
+ * unix/configure: autoconf-2.59
+
2005-06-07 Donal K. Fellows <donal.k.fellows@manchester.ac.uk>
Bump patchlevel to a4 to distinguish from a3 release.
diff --git a/macosx/Makefile b/macosx/Makefile
index 283af72..42e635c 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -4,7 +4,7 @@
# uses the standard unix build system in tk/unix (which can be used directly instead of this
# if you are not using the tk/macosx projects).
#
-# RCS: @(#) $Id: Makefile,v 1.18 2005/06/03 08:52:35 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.19 2005/06/18 21:46:02 das Exp $
#
########################################################################################################
@@ -97,6 +97,7 @@ PRODUCT_NAME := Tk
UNIX_DIR := ${CURDIR}/../unix
VERSION := $(shell awk -F= '/^TK_VERSION/ {print $$2; nextfile}' ${UNIX_DIR}/configure.in)
TCL_VERSION := ${VERSION}
+wish := wish
WISH = wish${VERSION}
BUILD_TARGET := wish
@@ -117,6 +118,7 @@ ifeq (${TK_X11},)
override CONFIGURE_ARGS := ${CONFIGURE_ARGS} --enable-aqua
else
VERSION := ${VERSION}-X11
+wish := ${wish}-X11
endif
INSTALL_TARGETS = install-binaries install-libraries
@@ -216,7 +218,7 @@ else
if [ -n "$${RM_SYSTEM:-}" ]; then rm -f System; fi; \
if [ -n "$${RM_TCL:-}" ]; then rm -f ./${LIBDIR}/Tcl.framework; fi
# install wish symbolic link
- @ln -fs ${WISH} ${INSTALL_ROOT}${BINDIR}/wish
+ @ln -fs ${WISH} ${INSTALL_ROOT}${BINDIR}/${wish}
endif
endif
ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_)
diff --git a/unix/configure b/unix/configure
index edf3ec6..8d46a61 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5704,7 +5704,7 @@ echo "${ECHO_T}$tcl_cv_ld_single_module" >&6
SHLIB_SUFFIX=".dylib"
DL_OBJS="tclLoadDyld.o"
DL_LIBS=""
- LDFLAGS="$LDFLAGS -prebind"
+ LDFLAGS="$LDFLAGS -prebind -headerpad_max_install_names"
echo "$as_me:$LINENO: checking if ld accepts -search_paths_first flag" >&5
echo $ECHO_N "checking if ld accepts -search_paths_first flag... $ECHO_C" >&6
if test "${tcl_cv_ld_search_paths_first+set}" = set; then
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 1402309..74c181b 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1423,7 +1423,7 @@ dnl AC_CHECK_TOOL(AR, ar)
SHLIB_SUFFIX=".dylib"
DL_OBJS="tclLoadDyld.o"
DL_LIBS=""
- LDFLAGS="$LDFLAGS -prebind"
+ LDFLAGS="$LDFLAGS -prebind -headerpad_max_install_names"
AC_CACHE_CHECK([if ld accepts -search_paths_first flag], tcl_cv_ld_search_paths_first, [
hold_ldflags=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,-search_paths_first"