*** win/configure.orig	Wed Dec 15 05:00:24 1999
--- win/configure	Sun Jan 16 17:43:06 2000
***************
*** 1022,1042 ****
      # set various compiler flags depending on whether we are using gcc or cl
      
      if test "${GCC}" = "yes" ; then
! 	CFLAGS_DEBUG=-g
! 	CFLAGS_OPTIMIZE=-O
! 	CFLAGS_WARNING="-Wall -Wconversion"
! 	LDFLAGS_DEBUG=-g
! 	LDFLAGS_OPTIMIZE=-O
! 	PATHTYPE=-u
  	
  	# Specify the CC output file names based on the target name
! 	CC_OBJNAME="-o \$@"
! 	CC_EXENAME="-o \$@"
      else
  	SHLIB_LD="link -dll -nologo"
  	SHLIB_LD_LIBS="user32.lib advapi32.lib"
  	LIBS="user32.lib advapi32.lib"
  	AR="lib -nologo"
  	RC="rc"
  	MAKE_LIB="\${AR} -out:\$@"
  	MAKE_EXE="\${CC} -Fe\$@"
--- 1022,1077 ----
      # set various compiler flags depending on whether we are using gcc or cl
      
      if test "${GCC}" = "yes" ; then
! 	SHLIB_LD="dllwrap"
! 	SHLIB_LD_LIBS="-luser32 -ladvapi32"
! 	LIBS="user32.lib advapi32.lib"
! 	AR="ar cf"
! 	RC="winres"
! 	MAKE_LIB="\${AR} \$@"
! 	MAKE_EXE="\${CC} -Fe\$@"
! 	
! 	if test "${SHARED_BUILD}" = "0" ; then
! 	    # static
!             echo "$ac_t""using static flags" 1>&6
! 	    runtime=-MT
! 	    MAKE_DLL="echo "
! 	    LIBSUFFIX="s\${DBGX}.a"
! 	    LIBRARIES="\${STATIC_LIBRARIES}"
! 	    EXESUFFIX="s\${DBGX}.exe"
! 	    DLLSUFFIX=""
! 	else
! 	    # dynamic
!             echo "$ac_t""using shared flags" 1>&6
! 	    runtime=-MD
! 	    MAKE_DLL="\${SHLIB_LD} \${SHLIB_LD_LIBS} \$(LDFLAGS) -out:\$@"
! 	    LIBSUFFIX="\${DBGX}.a"
! 	    DLLSUFFIX="\${DBGX}.dll"
! 	    EXESUFFIX="\${DBGX}.exe"
! 	    LIBRARIES="\${SHARED_LIBRARIES}"
! 	fi
! 
! 	EXTRA_CFLAGS="-YX"
! 	CFLAGS_DEBUG="-nologo -Z7 -Od -WX ${runtime}d"
! 	CFLAGS_OPTIMIZE="-nologo -O2 -Gs -GD ${runtime}"
! 	CFLAGS_WARNING="-W3"
! 	LDFLAGS_DEBUG="-debug:full -debugtype:cv"
! 	LDFLAGS_OPTIMIZE="-release"
! 	PATHTYPE=-w
  	
  	# Specify the CC output file names based on the target name
! 	CC_OBJNAME="-Fo\$@"
! 	CC_EXENAME="-Fe\"\$(shell cygpath \$(PATHTYPE) '\$@')\""
! 
! 	# Specify linker flags depending on the type of app being 
! 	# built -- Console vs. Window.
! 	LDFLAGS_CONSOLE="-subsystem:console"
! 	LDFLAGS_WINDOW="-subsystem:windows"
      else
  	SHLIB_LD="link -dll -nologo"
  	SHLIB_LD_LIBS="user32.lib advapi32.lib"
  	LIBS="user32.lib advapi32.lib"
  	AR="lib -nologo"
+ 	STLIB_LD="lib -nologo"
  	RC="rc"
  	MAKE_LIB="\${AR} -out:\$@"
  	MAKE_EXE="\${CC} -Fe\$@"
***************
*** 1089,1095 ****
  
  
      echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
! echo "configure:1093: 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"
--- 1124,1130 ----
  
  
      echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
! echo "configure:1128: 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"
***************
*** 1122,1128 ****
  
  
      echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6
! echo "configure:1126: checking the location of tclConfig.sh" >&5
  
      if test -d ../../tcl8.2$TK_PATCH_LEVEL/win;  then
  	TCL_BIN_DIR_DEFAULT=../../tcl8.2$TK_PATCH_LEVEL/win
--- 1157,1163 ----
  
  
      echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6
! echo "configure:1161: checking the location of tclConfig.sh" >&5
  
      if test -d ../../tcl8.2$TK_PATCH_LEVEL/win;  then
  	TCL_BIN_DIR_DEFAULT=../../tcl8.2$TK_PATCH_LEVEL/win
***************
*** 1148,1154 ****
  
  
      echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6
! echo "configure:1152: 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
--- 1183,1189 ----
  
  
      echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6
! echo "configure:1187: 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
