summaryrefslogtreecommitdiffstats
path: root/unix/configure
diff options
context:
space:
mode:
authordas <das>2007-01-25 02:07:29 (GMT)
committerdas <das>2007-01-25 02:07:29 (GMT)
commitb03647d3c8be357389770831d31ab255ef96617a (patch)
tree0ef19fe34df3e4485c4e44ca1fcf3eef5b66751d /unix/configure
parent107083d2827f3392406b7c771bffc20643b58524 (diff)
downloadtk-b03647d3c8be357389770831d31ab255ef96617a.zip
tk-b03647d3c8be357389770831d31ab255ef96617a.tar.gz
tk-b03647d3c8be357389770831d31ab255ef96617a.tar.bz2
* unix/tcl.m4: integrate CPPFLAGS into CFLAGS as late as possible and
move (rather than duplicate) -isysroot flags from CFLAGS to CPPFLAGS to avoid errors about multiple -isysroot flags from some older gcc builds. * unix/configure: autoconf-2.59
Diffstat (limited to 'unix/configure')
-rwxr-xr-xunix/configure13
1 files changed, 9 insertions, 4 deletions
diff --git a/unix/configure b/unix/configure
index ac93cfb..f062a2d 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4747,7 +4747,6 @@ fi
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
@@ -5644,11 +5643,14 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6
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=1;i<=NF;i++) \
+ awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
if ($i~/^(isysroot|mmacosx-version-min)/) print "-"$i}'`"
+ CFLAGS="`echo " ${CFLAGS}" | \
+ awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
+ if (!($i~/^(isysroot|mmacosx-version-min)/)) print "-"$i}'`"
if test $do64bit = yes; then
case `arch` in
ppc)
@@ -6437,6 +6439,8 @@ _ACEOF
fi
+
+
# Step 4: disable dynamic loading if requested via a command-line switch.
# Check whether --enable-load or --disable-load was given.
@@ -10195,6 +10199,7 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
+CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS=""
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files