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 /unix/tcl.m4 | |
| 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 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 908b6ab..fab607f 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -31,7 +31,7 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [ AC_MSG_CHECKING([for Tcl configuration]) AC_CACHE_VAL(ac_cv_c_tclconfig,[ - # First check to see if --with-tclconfig was specified. + # First check to see if --with-tcl was specified. if test x"${with_tclconfig}" != x ; then if test -f "${with_tclconfig}/tclConfig.sh" ; then ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)` @@ -71,7 +71,7 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [ fi # check in a few other private locations - if test x"${ac_cv_c_tcliconfig}" = x ; then + if test x"${ac_cv_c_tclconfig}" = x ; then for i in \ ${srcdir}/../tcl \ `ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do @@ -386,7 +386,7 @@ AC_DEFUN(SC_ENABLE_THREADS, [ # Arguments: # none # -# Requires the following vars to be set: +# Requires the following vars to be set in the Makefile: # CFLAGS_DEBUG # CFLAGS_OPTIMIZE # LDFLAGS_DEBUG @@ -400,8 +400,8 @@ AC_DEFUN(SC_ENABLE_THREADS, [ # Defines the following vars: # CFLAGS_DEFAULT Sets to $(CFLAGS_DEBUG) if true # Sets to $(CFLAGS_OPTIMIZE) if false -# LDFLAGS_DEFAULT Sets to LDFLAGS_DEBUG if true -# Sets to LDFLAGS_OPTIMIZE if false +# LDFLAGS_DEFAULT Sets to $(LDFLAGS_DEBUG) if true +# Sets to $(LDFLAGS_OPTIMIZE) if false # DBGX Debug library extension # #------------------------------------------------------------------------ @@ -412,12 +412,12 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [ # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT. if test "$tcl_ok" = "yes"; then CFLAGS_DEFAULT='$(CFLAGS_DEBUG)' - LDFLAGS_DEFAULT="${LDFLAGS_DEBUG}" + LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)' DBGX=g AC_MSG_RESULT([yes]) else CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' - LDFLAGS_DEFAULT="${LDFLAGS_OPTIMIZE}" + LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)' DBGX="" AC_MSG_RESULT([no]) fi |