summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in14
-rw-r--r--win/configure.in6
-rw-r--r--win/tcl.m450
3 files changed, 43 insertions, 27 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 85b1d2c..e624052 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.8 1999/06/16 20:12:01 surles Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.9 1999/06/16 22:36:24 surles Exp $
VERSION = @TCL_VERSION@
@@ -260,13 +260,13 @@ TCLSH_OBJS = tclAppInit.$(OBJEXT)
TCL_OBJS = ${GENERIC_OBJS} ${WIN_OBJS} ${COMPAT_OBJS}
-all: binaries libraries man
+all: binaries libraries doc
binaries: @LIBRARIES@ $(STATIC_LIBRARIES) $(TCLSH)
libraries:
-man:
+doc:
$(TCLSH): $(TCL_LIB_FILE) $(TCLSH_OBJS)
$(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(LIBS) $(CC_EXENAME)
@@ -346,9 +346,9 @@ tclStubLib.${OBJEXT}: tclStubLib.c
.c.${OBJEXT}:
$(CC) -c $(CC_SWITCHES) -DBUILD_tcl ${DEPARG} $(CC_OBJNAME)
-install: install-binaries install-libraries
+install: all install-binaries install-libraries install-doc
-install-binaries: binaries
+install-binaries:
@$(MKDIR) -p "$(BIN_INSTALL_DIR)"
@$(MKDIR) -p "$(LIB_INSTALL_DIR)"
@for i in dde1.0 reg1.0; \
@@ -384,7 +384,7 @@ install-binaries: binaries
$(COPY) $(ROOT_DIR)/library/reg1.0/pkgIndex.tcl $(LIB_INSTALL_DIR)/reg1.0; \
fi
-install-libraries: libraries
+install-libraries:
@for i in $(prefix)/lib $(INCLUDE_INSTALL_DIR) \
$(SCRIPT_INSTALL_DIR); \
do \
@@ -425,6 +425,8 @@ install-libraries: libraries
$(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)/encoding"; \
done;
+install-doc:
+
test: binaries $(TCLTEST)
@TCL_LIBRARY="$(ROOT_DIR_NATIVE)/library"; export TCL_LIBRARY; \
./tcltest "$(ROOT_DIR_NATIVE)/tests/all.tcl" $(TESTFLAGS)
diff --git a/win/configure.in b/win/configure.in
index bf701ca..0a5b99a 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -2,7 +2,7 @@
# generate the file "configure", which is run during Tcl installation
# to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.6 1999/06/16 20:12:01 surles Exp $
+# RCS: @(#) $Id: configure.in,v 1.7 1999/06/16 22:36:24 surles Exp $
AC_INIT(../generic/tcl.h)
@@ -30,7 +30,6 @@ AC_PROG_MAKE_SET
# These two macros perform additinal compiler test.
#--------------------------------------------------------------------
-AC_PROG_CC
AC_CYGWIN
#--------------------------------------------------------------------
@@ -70,7 +69,7 @@ SC_CONFIG_CFLAGS
SC_ENABLE_SYMBOLS
CFLAGS=${CFLAGS_DEFAULT}
-LD_FLAGS=${LDFLAGS_DEFAULT}
+LDFLAGS=${LDFLAGS_DEFAULT}
TCL_DBGX=${DBGX}
#--------------------------------------------------------------------
@@ -80,7 +79,6 @@ TCL_DBGX=${DBGX}
eval "TCL_SRC_DIR=`cd $srcdir; pwd`"
eval "TCL_STUB_LIB_FILE=tclstub$VER${LIBSUFFIX}"
eval "TCL_DLL_FILE=tcl$VER${DLLSUFFIX}"
-eval "TCL_LIB_FILE=tcl$VER${LIBSUFFIX}"
AC_SUBST(TCL_VERSION)
AC_SUBST(TCL_MAJOR_VERSION)
diff --git a/win/tcl.m4 b/win/tcl.m4
index 9099193..e58d196 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -13,7 +13,7 @@
# Adds the following arguments to configure:
# --with-tcl=...
#
-# Defines the following vars:
+# Sets the following vars:
# TCL_BIN_DIR Full path to the tclConfig.sh file
#------------------------------------------------------------------------
@@ -34,7 +34,7 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [
if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
AC_MSG_ERROR(There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?)
fi
- AC_MSG_RESULT([$TCL_BIN_DIR])
+ AC_MSG_RESULT($TCL_BIN_DIR/tclConfig.sh)
])
#------------------------------------------------------------------------
@@ -51,7 +51,7 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [
# Adds the following arguments to configure:
# --with-tk=...
#
-# Defines the following vars:
+# Sets the following vars:
# TK_BIN_DIR Full path to the tkConfig.sh file
#------------------------------------------------------------------------
@@ -73,7 +73,7 @@ AC_DEFUN(SC_PATH_TKCONFIG, [
AC_MSG_ERROR(There is no tkConfig.sh in $TK_BIN_DIR: perhaps you did not specify the Tk *build* directory (not the toplevel Tk directory) or you forgot to configure Tk?)
fi
- AC_MSG_RESULT([$TK_BIN_DIR])
+ AC_MSG_RESULT($TK_BIN_DIR/tkConfig.sh)
])
#------------------------------------------------------------------------
@@ -89,12 +89,11 @@ AC_DEFUN(SC_PATH_TKCONFIG, [
#
# Results:
#
-# Sets the following vars that should be in tclConfig.sh:
+# Subst the following vars:
# TCL_BIN_DIR
# TCL_SRC_DIR
# TCL_LIB_FILE
-# Defines the following vars:
-# TCL_THREADS
+#
#------------------------------------------------------------------------
AC_DEFUN(SC_LOAD_TCLCONFIG, [
@@ -107,9 +106,15 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [
AC_MSG_RESULT([file not found])
fi
- if test "$TCL_THREADS" = "1"; then
- AC_DEFINE(TCL_THREADS)
- fi
+ # The eval is required to do the TCL_DBGX substitution in the
+ # TCL_LIB_FILE variable.
+
+ eval TCL_LIB_FILE=${TCL_LIB_FILE}
+ eval TCL_LIB_FLAG=${TCL_LIB_FLAG}
+
+ AC_SUBST(TCL_BIN_DIR)
+ AC_SUBST(TCL_SRC_DIR)
+ AC_SUBST(TCL_LIB_FILE)
])
#------------------------------------------------------------------------
@@ -138,6 +143,11 @@ AC_DEFUN(SC_LOAD_TKCONFIG, [
else
AC_MSG_RESULT([could not find $TK_BIN_DIR/tkConfig.sh])
fi
+
+
+ AC_SUBST(TK_BIN_DIR)
+ AC_SUBST(TK_SRC_DIR)
+ AC_SUBST(TK_LIB_FILE)
])
#------------------------------------------------------------------------
@@ -153,7 +163,7 @@ AC_DEFUN(SC_LOAD_TKCONFIG, [
# Adds the following arguments to configure:
# --enable-gcc
#
-# Defines the following vars:
+# Sets the following vars:
# CC Command to use for the compiler
#------------------------------------------------------------------------
@@ -162,6 +172,7 @@ AC_DEFUN(SC_ENABLE_GCC, [
[ok=$enableval], [ok=no])
if test "$ok" = "yes"; then
CC=gcc
+ AC_PROG_CC
else
CC=cl
fi
@@ -181,8 +192,11 @@ AC_DEFUN(SC_ENABLE_GCC, [
# --enable-shared=yes|no
#
# Defines the following vars:
+# STATIC_BUILD Used for building import/export libraries
+# on Windows.
+#
+# Sets the following vars:
# SHARED_BUILD Value of 1 or 0
-# STATIC_BUILD
#------------------------------------------------------------------------
AC_DEFUN(SC_ENABLE_SHARED, [
@@ -223,17 +237,19 @@ AC_DEFUN(SC_ENABLE_SHARED, [
#
# Defines the following vars:
# TCL_THREADS
-#
#------------------------------------------------------------------------
AC_DEFUN(SC_ENABLE_THREADS, [
AC_MSG_CHECKING(for building with threads)
AC_ARG_ENABLE(threads, [ --enable-threads build with threads],
[tcl_ok=$enableval], [tcl_ok=no])
+
if test "$tcl_ok" = "yes"; then
AC_MSG_RESULT(yes)
+ TCL_THREADS=1
AC_DEFINE(TCL_THREADS)
else
+ TCL_THREADS=0
AC_MSG_RESULT(no (default))
fi
])
@@ -269,13 +285,13 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [
AC_ARG_ENABLE(symbols, [ --enable-symbols build with debugging symbols [--disable-symbols]], [tcl_ok=$enableval], [tcl_ok=no])
if test "$tcl_ok" = "yes"; then
- CFLAGS_DEFAULT='${CFLAGS_DEBUG}'
- LDFLAGS_DEFAULT='${LDFLAGS_DEBUG}'
+ CFLAGS_DEFAULT="${CFLAGS_DEBUG}"
+ LDFLAGS_DEFAULT="${LDFLAGS_DEBUG}"
DBGX=d
AC_MSG_RESULT([yes])
else
- CFLAGS_DEFAULT='${CFLAGS_OPTIMIZE}'
- LDFLAGS_DEFAULT='${LDFLAGS_OPTIMIZE}'
+ CFLAGS_DEFAULT="${CFLAGS_OPTIMIZE}"
+ LDFLAGS_DEFAULT="${LDFLAGS_OPTIMIZE}"
DBGX=""
AC_MSG_RESULT([no])
fi
generated by cgit v0.12 at 2024-11-09 10:58:46 (GMT)