diff options
| author | das <das> | 2007-01-25 02:06:23 (GMT) |
|---|---|---|
| committer | das <das> | 2007-01-25 02:06:23 (GMT) |
| commit | c3cb90f8f7050dde3edaa63f5f3644220af6ffce (patch) | |
| tree | d7fd4c5ab727fddf005fadf9c12eebb97e2ed752 /unix/configure | |
| parent | cbf7cd3db2f7e8c8951c2bbb101a52a264fc9f75 (diff) | |
| download | tcl-c3cb90f8f7050dde3edaa63f5f3644220af6ffce.zip tcl-c3cb90f8f7050dde3edaa63f5f3644220af6ffce.tar.gz tcl-c3cb90f8f7050dde3edaa63f5f3644220af6ffce.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-x | unix/configure | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/unix/configure b/unix/configure index 6a5571c..be430fc 100755 --- a/unix/configure +++ b/unix/configure @@ -6471,7 +6471,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 @@ -7368,11 +7367,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) @@ -8161,6 +8163,8 @@ _ACEOF fi + + # Step 4: disable dynamic loading if requested via a command-line switch. # Check whether --enable-load or --disable-load was given. @@ -17856,6 +17860,7 @@ rm -f confdef2opt.sed +CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS="" : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files |