From b051d9a81becdf9a242bd555d5f061d748fec91e Mon Sep 17 00:00:00 2001 From: das Date: Sat, 18 Jun 2005 21:47:46 +0000 Subject: *** 8.4.11 TAGGED FOR RELEASE *** * 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.13 --- ChangeLog | 12 +++++++++++- macosx/Makefile | 6 ++++-- unix/configure | 2 +- unix/tcl.m4 | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc95c19..8702c5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,17 @@ -2005-06-18 Don Porter +2005-06-18 Daniel Steffen *** 8.4.11 TAGGED FOR RELEASE *** + * 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.13 + +2005-06-18 Don Porter + * changes: Update changes for 8.4.11 release * README: Bump version number to 8.4.11 diff --git a/macosx/Makefile b/macosx/Makefile index b46aee2..e611787 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.7.2.10 2005/06/03 08:54:12 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.7.2.11 2005/06/18 21:47:47 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 9c074b5..c464954 100755 --- a/unix/configure +++ b/unix/configure @@ -2766,7 +2766,7 @@ echo "$ac_t""$tcl_cv_ld_single_module" 1>&6 SHLIB_SUFFIX=".dylib" DL_OBJS="tclLoadDyld.o" DL_LIBS="" - LDFLAGS="$LDFLAGS -prebind" + LDFLAGS="$LDFLAGS -prebind -headerpad_max_install_names" echo $ac_n "checking if ld accepts -search_paths_first flag""... $ac_c" 1>&6 echo "configure:2772: checking if ld accepts -search_paths_first flag" >&5 if eval "test \"`echo '$''{'tcl_cv_ld_search_paths_first'+set}'`\" = set"; then diff --git a/unix/tcl.m4 b/unix/tcl.m4 index fc91c3d..4749011 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1377,7 +1377,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" -- cgit v0.12