diff options
| author | mdejong <mdejong> | 2001-06-22 23:59:48 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2001-06-22 23:59:48 (GMT) |
| commit | 653dd70d1e0efe8e90b7e8e44f7b1823d5bc0add (patch) | |
| tree | cb63c3adf3794d0d743e2a9d1852748190d231b8 /win/configure.in | |
| parent | 83ca1ca9b40094b453deb82faa202aa2d9fb7a03 (diff) | |
| download | tk-653dd70d1e0efe8e90b7e8e44f7b1823d5bc0add.zip tk-653dd70d1e0efe8e90b7e8e44f7b1823d5bc0add.tar.gz tk-653dd70d1e0efe8e90b7e8e44f7b1823d5bc0add.tar.bz2 | |
* unix/Makefile.in: Set CFLAGS to @CFLAGS@ and @CFLAGS_DEFAULT@.
Set LDFLAGS to @LDFLAGS@ and @LDFLAGS_DEFAULT@. Add LDFLAGS_DEBUG
and LDFLAGS_OPTIMIZE to match the way CFLAGS_DEFAULT works. Use
new LDFLAGS variable in the Makefile instead of @LDFLAGS@.
* unix/configure: Regen.
* unix/configure.in: Don't set CFLAGS to CFLAGS_DEFAULT, instead
subst CFLAGS_DEFAULT into the Makefile. Add AC_SUBST for CFLAGS_DEBUG,
CFLAGS_OPTIMIZE, LDFLAGS_DEFAULT, LDFLAGS_DEBUG, and LDFLAGS_OPTIMIZE.
Remove unused LD_FLAGS subst.
* unix/tcl.m4: Update from Tcl.
* win/Makefile.in: Set CFLAGS to @CFLAGS@ and @CFLAGS_DEFAULT@.
Set LDFLAGS to @LDFLAGS@ and @LDFLAGS_DEFAULT@.
* win/configure: Regen.
* win/configure.in: Don't set CFLAGS or LDFLAGS, instead subst
CFLAGS_DEFAULT and LDFLAGS_DEFAULT into the Makefile.
* win/tcl.m4: Update from Tcl.
Diffstat (limited to 'win/configure.in')
| -rw-r--r-- | win/configure.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/win/configure.in b/win/configure.in index 6346044..1c867fb 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,7 +2,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.26 2001/06/06 07:58:23 mdejong Exp $ +# RCS: @(#) $Id: configure.in,v 1.27 2001/06/22 23:59:48 mdejong Exp $ AC_INIT(../generic/tk.h) @@ -100,8 +100,6 @@ AC_SUBST(MAN2TCLFLAGS) SC_ENABLE_SYMBOLS -CFLAGS=${CFLAGS_DEFAULT} -LDFLAGS=${LDFLAGS_DEFAULT} TK_DBGX=${DBGX} #-------------------------------------------------------------------- @@ -210,6 +208,7 @@ AC_SUBST(TK_SHARED_BUILD) AC_SUBST(PATHTYPE) AC_SUBST(CYGPATH) AC_SUBST(VPSEP) +AC_SUBST(CFLAGS_DEFAULT) AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_OPTIMIZE) AC_SUBST(CFLAGS_WARNING) @@ -221,7 +220,7 @@ AC_SUBST(SHLIB_CFLAGS) AC_SUBST(SHLIB_SUFFIX) AC_SUBST(CC_OBJNAME) AC_SUBST(CC_EXENAME) -AC_SUBST(LDFLAGS) +AC_SUBST(LDFLAGS_DEFAULT) AC_SUBST(LDFLAGS_DEBUG) AC_SUBST(LDFLAGS_OPTIMIZE) AC_SUBST(LDFLAGS_CONSOLE) |