From 1db742bc9e473d2b3172fdc5328b673a301ec365 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Fri, 19 Jan 2007 01:05:17 +0000
Subject: 	* macosx/Wish.xcodeproj/project.pbxproj: remove libtommath
 defines.

	* 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.59
---
 ChangeLog                             | 11 +++++++++++
 macosx/Wish.xcodeproj/project.pbxproj |  8 --------
 unix/configure                        |  7 +++++++
 unix/tcl.m4                           |  7 +++++++
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5362911..86893dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-19  Daniel Steffen  <das@users.sourceforge.net>
+
+	* macosx/Wish.xcodeproj/project.pbxproj: remove libtommath defines.
+
+	* 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.59
+
 2007-01-11  Jeff Hobbs  <jeffh@activestate.com>
 
 	* unix/tkUnixEvent.c, library/msgs/es.msg: s/CRLF/LF/g
diff --git a/macosx/Wish.xcodeproj/project.pbxproj b/macosx/Wish.xcodeproj/project.pbxproj
index 28ebae6..0383aef 100644
--- a/macosx/Wish.xcodeproj/project.pbxproj
+++ b/macosx/Wish.xcodeproj/project.pbxproj
@@ -4019,8 +4019,6 @@
 					HAVE_TK_CONFIG_H,
 					TCL_NO_DEPRECATED,
 					HAVE_TCL_CONFIG_H,
-					TCL_TOMMATH,
-					"MP_PREC=4",
 					"${GCC_PREPROCESSOR_DEFINITIONS}",
 				);
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -4157,8 +4155,6 @@
 					HAVE_TK_CONFIG_H,
 					TCL_NO_DEPRECATED,
 					HAVE_TCL_CONFIG_H,
-					TCL_TOMMATH,
-					"MP_PREC=4",
 					"${GCC_PREPROCESSOR_DEFINITIONS}",
 				);
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -4230,8 +4226,6 @@
 					HAVE_TK_CONFIG_H,
 					TCL_NO_DEPRECATED,
 					HAVE_TCL_CONFIG_H,
-					TCL_TOMMATH,
-					"MP_PREC=4",
 					"${GCC_PREPROCESSOR_DEFINITIONS}",
 				);
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -4303,8 +4297,6 @@
 					HAVE_TK_CONFIG_H,
 					TCL_NO_DEPRECATED,
 					HAVE_TCL_CONFIG_H,
-					TCL_TOMMATH,
-					"MP_PREC=4",
 					"${GCC_PREPROCESSOR_DEFINITIONS}",
 				);
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
diff --git a/unix/configure b/unix/configure
index d8fb139..ac93cfb 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4747,6 +4747,7 @@ 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
@@ -5642,6 +5643,12 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6
 	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)
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 140d25a..34b9f7a 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1113,6 +1113,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
@@ -1574,6 +1575,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)
-- 
cgit v0.12