summaryrefslogtreecommitdiffstats
path: root/unix/tcl.m4
diff options
context:
space:
mode:
authordas <das>2007-01-19 01:06:20 (GMT)
committerdas <das>2007-01-19 01:06:20 (GMT)
commitc652b30c3812e580ffee488266deec04777bd9fd (patch)
tree66f2c148f23d50db37ef0c888224f2f2124ef431 /unix/tcl.m4
parent188b49552148e50849be26506adbb3ab3077ddb6 (diff)
downloadtk-c652b30c3812e580ffee488266deec04777bd9fd.zip
tk-c652b30c3812e580ffee488266deec04777bd9fd.tar.gz
tk-c652b30c3812e580ffee488266deec04777bd9fd.tar.bz2
* unix/tcl.m4: ensure CPPFLAGS env var is used when set. [Bug 1586861]
(Darwin): add -isysroot and -mmacosx-version-min flags to CPPFLAGS when present in CFLAGS to avoid discrepancies between what headers configure sees during preprocessing tests and compiling tests. * unix/configure: autoconf-2.13
Diffstat (limited to 'unix/tcl.m4')
-rw-r--r--unix/tcl.m47
1 files changed, 7 insertions, 0 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 13f533a..56142d7 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1039,6 +1039,7 @@ 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
@@ -1559,6 +1560,12 @@ dnl AC_CHECK_TOOL(AR, ar)
Darwin-*)
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:
+ CPPFLAGS="${CPPFLAGS} `echo " ${CFLAGS}" | \
+ awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=1;i<=NF;i++) \
+ if ([$]i~/^(isysroot|mmacosx-version-min)/) print "-"[$]i}'`"
if test $do64bit = yes; then
case `arch` in
ppc)