diff options
author | hobbs <hobbs> | 2004-07-19 20:12:23 (GMT) |
---|---|---|
committer | hobbs <hobbs> | 2004-07-19 20:12:23 (GMT) |
commit | 34259c8123aa7777282ae8029f04aa8caea77e1c (patch) | |
tree | 1c05143c6833848f50a39cd8c68622f9734e11ce /unix/Makefile.in | |
parent | 48736811b83b5c70f8e77e05cf69ab9ae173bb5d (diff) | |
download | tcl-34259c8123aa7777282ae8029f04aa8caea77e1c.zip tcl-34259c8123aa7777282ae8029f04aa8caea77e1c.tar.gz tcl-34259c8123aa7777282ae8029f04aa8caea77e1c.tar.bz2 |
* unix/Makefile.in, unix/tcl.m4: move (C|LD)FLAGS after their
* unix/configure.in, unix/configure: _DEFAULT to allow for env
setting to override m4 switches.
Consolidate header checks to limit redundancy in configure.
(CFLAGS_WARNING): Remove -Wconversion, add -fno-strict-aliasing
for gcc builds (need to suppress 3.x type puning warnings).
(SC_ENABLE_THREADS): Set m4 to force threaded build when built
against a threaded Tcl core.
Reorder configure.in for better 64-bit build configuration,
replacing EXTRA_CFLAGS with CFLAGS. [Bug #874058]
Diffstat (limited to 'unix/Makefile.in')
-rw-r--r-- | unix/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 1da4b77..6a0aad0 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.121.2.4 2003/07/23 15:40:39 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.121.2.5 2004/07/19 20:12:24 hobbs Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -90,12 +90,12 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) -CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -DTCL_DBGX=$(TCL_DBGX) +CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX) # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@ -LDFLAGS = @LDFLAGS@ @LDFLAGS_DEFAULT@ +LDFLAGS = @LDFLAGS_DEFAULT@ @LDFLAGS@ # To disable ANSI-C procedure prototypes reverse the comment characters # on the following lines: @@ -239,7 +239,7 @@ DYLIB_INSTALL_DIR = ${LIB_RUNTIME_DIR} COMPAT_OBJS = @LIBOBJS@ -AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@ +AC_FLAGS = @DEFS@ AR = @AR@ RANLIB = @RANLIB@ SRC_DIR = @srcdir@ |