diff options
| author | hobbs <hobbs> | 2004-07-19 20:30:01 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2004-07-19 20:30:01 (GMT) |
| commit | 23b110750cfc4d080d64119fc3b48df02527a094 (patch) | |
| tree | 1d645438131cebe453323b4abe6fcaec7fbcf266 /unix/Makefile.in | |
| parent | e588dc1eeed689236f0c555b83ceeb0ae136dc13 (diff) | |
| download | tk-23b110750cfc4d080d64119fc3b48df02527a094.zip tk-23b110750cfc4d080d64119fc3b48df02527a094.tar.gz tk-23b110750cfc4d080d64119fc3b48df02527a094.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 ecd6d59..913b2ce 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.87.2.2 2003/11/11 00:05:36 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.87.2.3 2004/07/19 20:30:01 hobbs Exp $ # Current Tk version; used in various names. @@ -113,12 +113,12 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) -CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ +CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@ -LDFLAGS = @LDFLAGS@ @LDFLAGS_DEFAULT@ +LDFLAGS = @LDFLAGS_DEFAULT@ @LDFLAGS@ # A "-I" switch that can be used when compiling to make all of the # X11 include files accessible (the configure script will try to @@ -254,7 +254,7 @@ DYLIB_INSTALL_DIR = ${LIB_RUNTIME_DIR} # modify any of this stuff by hand. #---------------------------------------------------------------- -AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@ +AC_FLAGS = @DEFS@ AR = @AR@ RANLIB = @RANLIB@ SRC_DIR = @srcdir@/.. |