summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2005-12-01 04:28:25 (GMT)
committerdas <das>2005-12-01 04:28:25 (GMT)
commit9bd90ef64bb483339cafdeeb79f0274563aa9d63 (patch)
tree1b5b243bf7f0975d72310d69a18c1576fd858f5f
parent2ab9a8eaf6ffdff3cbf822ebf40b28e68261ea00 (diff)
downloadtk-9bd90ef64bb483339cafdeeb79f0274563aa9d63.zip
tk-9bd90ef64bb483339cafdeeb79f0274563aa9d63.tar.gz
tk-9bd90ef64bb483339cafdeeb79f0274563aa9d63.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 df40cd8..cdbcbf3 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 Jeff Hobbs <jeffh@ActiveState.com>
* doc/checkbutton.n: fix -selectcolor docs [Bug 1083838]
diff --git a/unix/configure b/unix/configure
index 15114cb..6621cb5 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5486,10 +5486,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