summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authormdejong <mdejong>2001-04-25 22:01:24 (GMT)
committermdejong <mdejong>2001-04-25 22:01:24 (GMT)
commita45e56585d9c1954635d19af697119c4ed0f8fc2 (patch)
treecc93684f0b6ab3779c1dc3e692c67d15743d3d9b /win
parentd2026f0a6b8d9cd389b0fe7f8d9ba521ff99546f (diff)
downloadtcl-a45e56585d9c1954635d19af697119c4ed0f8fc2.zip
tcl-a45e56585d9c1954635d19af697119c4ed0f8fc2.tar.gz
tcl-a45e56585d9c1954635d19af697119c4ed0f8fc2.tar.bz2
* unix/configure: Regen.
* unix/tcl.m4: Subst TCL_THREADS into tclConfig.sh. * unix/tclConfig.sh.in: Add TCL_THREADS variable. * win/configure: Regen. * win/tcl.m4: Subst TCL_THREADS into tclConfig.sh. * win/tclConfig.sh.in: Add TCL_THREADS variable.
Diffstat (limited to 'win')
-rwxr-xr-xwin/configure32
-rw-r--r--win/tcl.m41
-rw-r--r--win/tclConfig.sh.in6
3 files changed, 23 insertions, 16 deletions
diff --git a/win/configure b/win/configure
index 28ef7cb..769faf2 100755
--- a/win/configure
+++ b/win/configure
@@ -1058,6 +1058,7 @@ EOF
TCL_THREADS=0
echo "$ac_t""no (default)" 1>&6
fi
+
#--------------------------------------------------------------------
@@ -1067,7 +1068,7 @@ EOF
echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
-echo "configure:1071: checking how to build libraries" >&5
+echo "configure:1072: checking how to build libraries" >&5
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
enableval="$enable_shared"
@@ -1108,7 +1109,7 @@ EOF
# Step 0: Enable 64 bit support?
echo $ac_n "checking if 64bit support is requested""... $ac_c" 1>&6
-echo "configure:1112: checking if 64bit support is requested" >&5
+echo "configure:1113: checking if 64bit support is requested" >&5
# Check whether --enable-64bit or --disable-64bit was given.
if test "${enable_64bit+set}" = set; then
enableval="$enable_64bit"
@@ -1120,7 +1121,7 @@ fi
echo "$ac_t""$do64bit" 1>&6
echo $ac_n "checking compiler flags""... $ac_c" 1>&6
-echo "configure:1124: checking compiler flags" >&5
+echo "configure:1125: checking compiler flags" >&5
# Set some defaults (may get changed below)
EXTRA_CFLAGS=""
@@ -1191,7 +1192,7 @@ echo "configure:1124: checking compiler flags" >&5
fi
echo $ac_n "checking whether $ld_prog supports -shared option""... $ac_c" 1>&6
-echo "configure:1195: checking whether $ld_prog supports -shared option" >&5
+echo "configure:1196: checking whether $ld_prog supports -shared option" >&5
# now the ad-hoc check to see if GNU ld supports --shared.
if "$LD" --shared 2>&1 | egrep ': -shared not supported' >/dev/null; then
@@ -1302,7 +1303,7 @@ echo "configure:1195: checking whether $ld_prog supports -shared option" >&5
echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
-echo "configure:1306: checking for build with symbols" >&5
+echo "configure:1307: checking for build with symbols" >&5
# Check whether --enable-symbols or --disable-symbols was given.
if test "${enable_symbols+set}" = set; then
enableval="$enable_symbols"
@@ -1334,7 +1335,7 @@ TCL_DBGX=${DBGX}
#--------------------------------------------------------------------
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1338: checking how to run the C preprocessor" >&5
+echo "configure:1339: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1349,13 +1350,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1353 "configure"
+#line 1354 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1366,13 +1367,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1370 "configure"
+#line 1371 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1383,13 +1384,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1387 "configure"
+#line 1388 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1415,17 +1416,17 @@ echo "$ac_t""$CPP" 1>&6
ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for errno.h""... $ac_c" 1>&6
-echo "configure:1419: checking for errno.h" >&5
+echo "configure:1420: checking for errno.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1424 "configure"
+#line 1425 "configure"
#include "confdefs.h"
#include <errno.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1721,6 +1722,7 @@ s%@RC@%$RC%g
s%@SET_MAKE@%$SET_MAKE%g
s%@OBJEXT@%$OBJEXT%g
s%@EXEEXT@%$EXEEXT%g
+s%@TCL_THREADS@%$TCL_THREADS%g
s%@CPP@%$CPP%g
s%@MAN2TCLFLAGS@%$MAN2TCLFLAGS%g
s%@TCL_VERSION@%$TCL_VERSION%g
diff --git a/win/tcl.m4 b/win/tcl.m4
index e55df16..abbf32d 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -224,6 +224,7 @@ AC_DEFUN(SC_ENABLE_THREADS, [
TCL_THREADS=0
AC_MSG_RESULT([no (default)])
fi
+ AC_SUBST(TCL_THREADS)
])
#------------------------------------------------------------------------
diff --git a/win/tclConfig.sh.in b/win/tclConfig.sh.in
index 5b35f0d..b9a40dc 100644
--- a/win/tclConfig.sh.in
+++ b/win/tclConfig.sh.in
@@ -9,7 +9,7 @@
#
# The information in this file is specific to a single platform.
#
-# RCS: @(#) $Id: tclConfig.sh.in,v 1.6 2000/09/28 06:33:18 hobbs Exp $
+# RCS: @(#) $Id: tclConfig.sh.in,v 1.7 2001/04/25 22:01:24 mdejong Exp $
TCL_DLL_FILE="@TCL_DLL_FILE@"
@@ -172,3 +172,7 @@ TCL_BUILD_STUB_LIB_PATH='@TCL_BUILD_STUB_LIB_PATH@'
# Path to the Tcl stub library in the install directory.
TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
+
+# Flag, 1: we built Tcl with threads enables, 0 we didn't
+TCL_THREADS=@TCL_THREADS@
+