summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in6
-rwxr-xr-xwin/configure15
-rw-r--r--win/configure.in7
-rw-r--r--win/tcl.m410
4 files changed, 19 insertions, 19 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 29cc6eb..0a240d2 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.36 2001/03/30 21:53:12 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.37 2001/06/22 23:59:48 mdejong Exp $
TCLVERSION = @TCL_VERSION@
VERSION = @TK_VERSION@
@@ -161,7 +161,7 @@ LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@
# Special compiler flags to use when building man2tcl on Windows.
MAN2TCLFLAGS = @MAN2TCLFLAGS@
@@ -174,7 +174,7 @@ RES = @RES@
TK_RES = @TK_RES@
AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@
CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ @LDFLAGS_DEFAULT@
LDFLAGS_CONSOLE = @LDFLAGS_CONSOLE@
LDFLAGS_WINDOW = @LDFLAGS_WINDOW@
EXEEXT = @EXEEXT@
diff --git a/win/configure b/win/configure
index e04096d..7f212fd 100755
--- a/win/configure
+++ b/win/configure
@@ -1441,19 +1441,17 @@ fi
if test "$tcl_ok" = "yes"; then
CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
- LDFLAGS_DEFAULT="${LDFLAGS_DEBUG}"
+ LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG})'
DBGX=d
echo "$ac_t""yes" 1>&6
else
CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
- LDFLAGS_DEFAULT="${LDFLAGS_OPTIMIZE}"
+ LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
DBGX=""
echo "$ac_t""no" 1>&6
fi
-CFLAGS=${CFLAGS_DEFAULT}
-LDFLAGS=${LDFLAGS_DEFAULT}
TK_DBGX=${DBGX}
#--------------------------------------------------------------------
@@ -1462,7 +1460,7 @@ TK_DBGX=${DBGX}
echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6
-echo "configure:1466: checking the location of tclConfig.sh" >&5
+echo "configure:1464: checking the location of tclConfig.sh" >&5
if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then
TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win
@@ -1488,7 +1486,7 @@ fi
echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6
-echo "configure:1492: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
+echo "configure:1490: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
echo "$ac_t""loading" 1>&6
@@ -1510,7 +1508,7 @@ echo "configure:1492: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
echo $ac_n "checking for tclsh""... $ac_c" 1>&6
-echo "configure:1514: checking for tclsh" >&5
+echo "configure:1512: checking for tclsh" >&5
if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1677,6 +1675,7 @@ fi
+
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@@ -1863,6 +1862,7 @@ s%@TK_SHARED_BUILD@%$TK_SHARED_BUILD%g
s%@PATHTYPE@%$PATHTYPE%g
s%@CYGPATH@%$CYGPATH%g
s%@VPSEP@%$VPSEP%g
+s%@CFLAGS_DEFAULT@%$CFLAGS_DEFAULT%g
s%@CFLAGS_DEBUG@%$CFLAGS_DEBUG%g
s%@CFLAGS_OPTIMIZE@%$CFLAGS_OPTIMIZE%g
s%@CFLAGS_WARNING@%$CFLAGS_WARNING%g
@@ -1874,6 +1874,7 @@ s%@SHLIB_CFLAGS@%$SHLIB_CFLAGS%g
s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g
s%@CC_OBJNAME@%$CC_OBJNAME%g
s%@CC_EXENAME@%$CC_EXENAME%g
+s%@LDFLAGS_DEFAULT@%$LDFLAGS_DEFAULT%g
s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
s%@LDFLAGS_CONSOLE@%$LDFLAGS_CONSOLE%g
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)
diff --git a/win/tcl.m4 b/win/tcl.m4
index ba58cad..2bdaad1 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -235,7 +235,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
#
@@ -247,8 +247,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
#
#------------------------------------------------------------------------
@@ -259,12 +259,12 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [
if test "$tcl_ok" = "yes"; then
CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
- LDFLAGS_DEFAULT="${LDFLAGS_DEBUG}"
+ LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG})'
DBGX=d
AC_MSG_RESULT([yes])
else
CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
- LDFLAGS_DEFAULT="${LDFLAGS_OPTIMIZE}"
+ LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
DBGX=""
AC_MSG_RESULT([no])
fi