Merged changes between child workspace "/home/escoffon/ws/tcl8.0" and

 parent workspace "/export/home/ws/tcl8.0".

4 files changed, 44 insertions, 28 deletions

diff --git a/generic/tcl.h b/generic/tcl.h
index db9339a..fb5fc94 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: %Z% $Id: tcl.h,v 1.11 1998/07/20 16:54:16 welch Exp $ 
+ * SCCS: %Z% $Id: tcl.h,v 1.12 1998/07/21 15:25:42 escoffon Exp $ 
  */
 
 #ifndef _TCL
@@ -209,15 +209,19 @@ typedef long LONG;
  * Used by windows, maps to a simple declaration on non-windows systems
  */
 #ifdef __WIN32__
-#   if defined(_MSC_VER)
-#      define EXPORT(a,b) __declspec(dllexport) a b
+# ifdef STATIC_BUILD
+#  define EXPORT(a,b) a b
+# else
+#  if defined(_MSC_VER)
+#   define EXPORT(a,b) __declspec(dllexport) a b
+#  else
+#   if defined(__BORLANDC__)
+#	 define EXPORT(a,b) a _export b
 #   else
-#      if defined(__BORLANDC__)
-#	   define EXPORT(a,b) a _export b
-#      else
-#	   define EXPORT(a,b) a b
-#      endif
+#	 define EXPORT(a,b) a b
 #   endif
+#  endif
+# endif
 #else
 #   define EXPORT(a,b) a b
 #endif
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 180ce03..8a96a01 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -178,6 +178,9 @@ BUILD_DLTEST = @BUILD_DLTEST@
 TCL_LIB_FILE = @TCL_LIB_FILE@
 #TCL_LIB_FILE = libtcl.a
 
+TCL_LIB_FLAG = @TCL_LIB_FLAG@
+#TCL_LIB_FLAG = -ltcl
+
 #----------------------------------------------------------------
 # The information below is modified by the configure script when
 # Makefile is generated from Makefile.in.  You shouldn't normally
diff --git a/unix/configure.in b/unix/configure.in
index 2462617..fd88976 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -2,7 +2,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tcl.h)
-# SCCS: %Z% $Id: configure.in,v 1.7 1998/07/20 16:54:38 welch Exp $ 
+# SCCS: %Z% $Id: configure.in,v 1.8 1998/07/21 15:26:05 escoffon Exp $ 
 
 TCL_VERSION=8.0
 TCL_MAJOR_VERSION=8
@@ -1167,9 +1167,9 @@ if test "$tcl_ok" = "yes" -a "${SHLIB_SUFFIX}" != "" ; then
     TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
     eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
     if test "x$DL_OBJS" = "xtclLoadAout.o"; then
-	MAKE_LIB="ar cr ${TCL_LIB_FILE} \${OBJS}"
+	MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
     else
-	MAKE_LIB="\${SHLIB_LD} -o ${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
+	MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
 	RANLIB=":"
     fi
 else
@@ -1188,7 +1188,7 @@ else
     TCL_SHLIB_CFLAGS=""
     TCL_LD_SEARCH_FLAGS=""
     eval "TCL_LIB_FILE=libtcl${TCL_UNSHARED_LIB_SUFFIX}"
-    MAKE_LIB="ar cr ${TCL_LIB_FILE} \${OBJS}"
+    MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
 fi
 
 # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
@@ -1203,12 +1203,12 @@ eval "CFG_TCL_UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX}"
 # up the Tcl library.
 
 if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TCL_BUILD_LIB_SPEC="-L`pwd` -ltcl${VERSION}\${DBGX}"
-    TCL_LIB_SPEC="-L${exec_prefix}/lib -ltcl${VERSION}\${DBGX}"
+    TCL_LIB_FLAG="-ltcl${VERSION}\${DBGX}"
 else
-    TCL_BUILD_LIB_SPEC="-L`pwd` -ltcl`echo ${VERSION} | tr -d .`\${DBGX}"
-    TCL_LIB_SPEC="-L${exec_prefix}/lib -ltcl`echo ${VERSION} | tr -d .`\${DBGX}"
+    TCL_LIB_FLAG="-ltcl`echo ${VERSION} | tr -d .`\${DBGX}"
 fi
+TCL_BUILD_LIB_SPEC="-L`pwd` \${TCL_LIB_FLAG}"
+TCL_LIB_SPEC="-L${exec_prefix}/lib \${TCL_LIB_FLAG}"
 
 #--------------------------------------------------------------------
 #	The statements below define the symbol TCL_PACKAGE_PATH, which
@@ -1242,6 +1242,7 @@ AC_SUBST(SHLIB_SUFFIX)
 AC_SUBST(TCL_BUILD_LIB_SPEC)
 AC_SUBST(TCL_LD_SEARCH_FLAGS)
 AC_SUBST(TCL_LIB_FILE)
+AC_SUBST(TCL_LIB_FLAG)
 AC_SUBST(TCL_LIB_SPEC)
 AC_SUBST(TCL_LIB_VERSIONS_OK)
 AC_SUBST(TCL_MAJOR_VERSION)
diff --git a/win/makefile.vc b/win/makefile.vc
index 554287f..7c73014 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -58,30 +58,32 @@ NODEBUG = 1
 # Do not modify below this line
 ######################################################################
 
+NAMEPREFIX = tcl
 DOTVERSION = 8.0
 VERSION = 80
 
+BINROOT		= .
 !IF "$(NODEBUG)" == "1"
-TMPDIR		= Release
+TMPDIR		= $(BINROOT)\Release
 DBGX		=
 !ELSE
-TMPDIR		= Debug
+TMPDIR		= $(BINROOT)\Debug
 DBGX		= d
 !ENDIF
 OUTDIR		= $(TMPDIR)
 
-TCLLIB		= $(OUTDIR)\tcl$(VERSION)$(DBGX).lib
-TCLDLLNAME	= tcl$(VERSION)$(DBGX).dll
+TCLLIB		= $(OUTDIR)\$(NAMEPREFIX)$(VERSION)$(DBGX).lib
+TCLDLLNAME	= $(NAMEPREFIX)$(VERSION)$(DBGX).dll
 TCLDLL		= $(OUTDIR)\$(TCLDLLNAME)
-TCLPLUGINLIB	= $(OUTDIR)\tcl$(VERSION)p$(DBGX).lib
-TCLPLUGINDLLNAME= tcl$(VERSION)p$(DBGX).dll
+TCLPLUGINLIB	= $(OUTDIR)\$(NAMEPREFIX)$(VERSION)p$(DBGX).lib
+TCLPLUGINDLLNAME= $(NAMEPREFIX)$(VERSION)p$(DBGX).dll
 TCLPLUGINDLL	= $(OUTDIR)\$(TCLPLUGINDLLNAME)
-TCL16DLL	= $(OUTDIR)\tcl16$(VERSION)$(DBGX).dll
-TCLSH		= $(OUTDIR)\tclsh$(VERSION)$(DBGX).exe
-TCLSHP		= $(OUTDIR)\tclshp$(VERSION)$(DBGX).exe
-TCLPIPEDLL	= $(OUTDIR)\tclpip$(VERSION)$(DBGX).dll
-TCLREGDLL	= $(OUTDIR)\tclreg$(VERSION)$(DBGX).dll
-TCLTEST		= $(OUTDIR)\tcltest.exe
+TCL16DLL	= $(OUTDIR)\$(NAMEPREFIX)16$(VERSION)$(DBGX).dll
+TCLSH		= $(OUTDIR)\$(NAMEPREFIX)sh$(VERSION)$(DBGX).exe
+TCLSHP		= $(OUTDIR)\$(NAMEPREFIX)shp$(VERSION)$(DBGX).exe
+TCLPIPEDLL	= $(OUTDIR)\$(NAMEPREFIX)pip$(VERSION)$(DBGX).dll
+TCLREGDLL	= $(OUTDIR)\$(NAMEPREFIX)reg$(VERSION)$(DBGX).dll
+TCLTEST		= $(OUTDIR)\$(NAMEPREFIX)test.exe
 DUMPEXTS	= $(TMPDIR)\dumpexts.exe
 CAT16		= $(TMPDIR)\cat16.exe
 CAT32		= $(TMPDIR)\cat32.exe
@@ -257,6 +259,12 @@ cvars      = -DWIN32 -D_WIN32
 cvarsmt    = $(cvars) -D_MT
 cvarsdll   = $(cvarsmt) -D_DLL
 
+!IF "$(NODEBUG)" == "1"
+cvarsdll   = $(cvars) -MD
+!ELSE
+cvarsdll   = $(cvars) -MDd
+!ENDIF
+
 ######################################################################
 # Project specific targets
 ######################################################################