summaryrefslogtreecommitdiffstats
path: root/unix/tcl.m4
diff options
context:
space:
mode:
authordas <das>2007-01-25 05:20:48 (GMT)
committerdas <das>2007-01-25 05:20:48 (GMT)
commit5c8cb1120f380374d054357960e46819e7c7c264 (patch)
tree6496235f5a8af80196f23116dd0cee2cf9d49ac6 /unix/tcl.m4
parentf830ccf77314f291c25c14d9bf17d2a4954b08c0 (diff)
downloadtk-5c8cb1120f380374d054357960e46819e7c7c264.zip
tk-5c8cb1120f380374d054357960e46819e7c7c264.tar.gz
tk-5c8cb1120f380374d054357960e46819e7c7c264.tar.bz2
previous commit omitted some changes from the HEAD
Diffstat (limited to 'unix/tcl.m4')
-rw-r--r--unix/tcl.m45
1 files changed, 2 insertions, 3 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 4e39e51..2662fec 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1039,7 +1039,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
ECHO_VERSION='`echo ${VERSION}`'
TCL_LIB_VERSIONS_OK=ok
- CFLAGS="${CPPFLAGS} ${CFLAGS}"
CFLAGS_DEBUG=-g
CFLAGS_OPTIMIZE=-O
if test "$GCC" = "yes" ; then
@@ -1561,8 +1560,8 @@ dnl AC_CHECK_TOOL(AR, ar)
CFLAGS_OPTIMIZE="-Os"
SHLIB_CFLAGS="-fno-common"
# To avoid discrepancies between what headers configure sees during
- # preprocessing tests and compiling tests, add any -isysroot and
- # -mmacosx-version-min flags present in CFLAGS to CPPFLAGS:
+ # preprocessing tests and compiling tests, move any -isysroot and
+ # -mmacosx-version-min flags from CFLAGS to CPPFLAGS:
CPPFLAGS="${CPPFLAGS} `echo " ${CFLAGS}" | \
awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
if ([$]i~/^(isysroot|mmacosx-version-min)/) print "-"[$]i}'`"