* Makefile.in: Added TCL_CFLAGS for flags that

	shouldn't be supressed by the top level Makefile's
	CFLAGS settings.

diff --git a/tcl/unix/ChangeLog b/tcl/unix/ChangeLog
index 6a24f6d..a7c8e51 100644 (file)
--- a/tcl/unix/ChangeLog
+++ b/tcl/unix/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-18  Ian Roxborough  <irox@redhat.com>
+
+       * Makefile.in: Added TCL_CFLAGS for flags that
+       shouldn't be supressed by the top level Makefile's
+       CFLAGS settings.
+
 Fri Mar 19 09:29:42 1999  Michael Tiemann  <tiemann@holodeck.cygnus.com>
 
        * configure.in, configure (IRIX64-6.*): Use -n32 instead of -32

diff --git a/tcl/unix/Makefile.in b/tcl/unix/Makefile.in
index a7dbf51..fa8ec8e 100644 (file)
--- a/tcl/unix/Makefile.in
+++ b/tcl/unix/Makefile.in
@@ -86,10 +86,12 @@ CFLAGS_OPTIMIZE             = @CFLAGS_OPTIMIZE@
 
 # To change the compiler switches, for example to change from optimization to
 # debugging symbols, change the following line:
-#CFLAGS                        = $(CFLAGS_DEBUG)
-#CFLAGS                        = $(CFLAGS_OPTIMIZE)
-#CFLAGS                        = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS                 = @CFLAGS@ @CFLAGS_DEFAULT@
+#TCL_CFLAGS                    = $(CFLAGS_DEBUG)
+#TCL_CFLAGS                    = $(CFLAGS_OPTIMIZE)
+#TCL_CFLAGS                    = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+TCL_CFLAGS                     = @CFLAGS_DEFAULT@
+
+CFLAGS = @CFLAGS@
 
 # Flags to pass to the linker
 LDFLAGS_DEBUG          = @LDFLAGS_DEBUG@
@@ -263,13 +265,13 @@ CC                        = @CC@
 #----------------------------------------------------------------
 
 
-CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
+CC_SWITCHES = ${CFLAGS} ${TCL_CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 -I${GENERIC_DIR} -I${SRC_DIR} \
 ${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} ${MEM_DEBUG_FLAGS} \
 ${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS} ${ENV_FLAGS} \
 -DTCL_SHLIB_EXT=\"${SHLIB_SUFFIX}\"
 
-STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
+STUB_CC_SWITCHES = ${CFLAGS} ${TCL_CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 -I${GENERIC_DIR} -I${SRC_DIR} \
 ${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} ${MEM_DEBUG_FLAGS} \
 ${COMPILE_DEBUG_FLAGS} ${ENV_FLAGS} -DTCL_SHLIB_EXT=\"${SHLIB_SUFFIX}\"