summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2005-12-01 02:14:17 (GMT)
committerdas <das>2005-12-01 02:14:17 (GMT)
commit69017663e915a742c38e4087eb54af223885cf2e (patch)
tree0358f7fb5adf0a578bd974c29421ff461dcb01f1
parentf4014a57db9561af6d9540399afc14cb2ed64523 (diff)
downloadtcl-69017663e915a742c38e4087eb54af223885cf2e.zip
tcl-69017663e915a742c38e4087eb54af223885cf2e.tar.gz
tcl-69017663e915a742c38e4087eb54af223885cf2e.tar.bz2
* unix/tcl.m4 (Darwin): fixed error when MACOSX_DEPLOYMENT_TARGET unset.
* unix/configure: regen.
-rw-r--r--ChangeLog5
-rwxr-xr-xunix/configure5
-rw-r--r--unix/tcl.m45
3 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 43d4764..4f30576 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-01 Daniel Steffen <das@users.sourceforge.net>
+
+ * unix/tcl.m4 (Darwin): fixed error when MACOSX_DEPLOYMENT_TARGET unset.
+ * unix/configure: regen.
+
2005-11-30 Donal K. Fellows <donal.k.fellows@manchester.ac.uk>
* unix/Makefile.in: Add dependency information relating to tclCompile.h
diff --git a/unix/configure b/unix/configure
index 2f721f3..be870d8 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7238,10 +7238,9 @@ echo "${ECHO_T}$tcl_cv_ld_single_module" >&6
DL_OBJS="tclLoadDyld.o"
DL_LIBS=""
# Don't use -prebind when building for Mac OS X 10.4 or later only:
- if test -z "${MACOSX_DEPLOYMENT_TARGET}" -o \
- `echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F. '{print $2}'` -lt 4; then
+ test -z "${MACOSX_DEPLOYMENT_TARGET}" || \
+ test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F. '{print $2}'`" -lt 4 && \
LDFLAGS="$LDFLAGS -prebind"
- fi
LDFLAGS="$LDFLAGS -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
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 571d836..211dae3 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1450,10 +1450,9 @@ dnl AC_CHECK_TOOL(AR, ar)
DL_OBJS="tclLoadDyld.o"
DL_LIBS=""
# Don't use -prebind when building for Mac OS X 10.4 or later only:
- if test -z "${MACOSX_DEPLOYMENT_TARGET}" -o \
- `echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F. '{print [$]2}'` -lt 4; then
+ test -z "${MACOSX_DEPLOYMENT_TARGET}" || \
+ test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F. '{print [$]2}'`" -lt 4 && \
LDFLAGS="$LDFLAGS -prebind"
- fi
LDFLAGS="$LDFLAGS -headerpad_max_install_names"
AC_CACHE_CHECK([if ld accepts -search_paths_first flag], tcl_cv_ld_search_paths_first, [
hold_ldflags=$LDFLAGS