diff options
| author | mdejong <mdejong> | 2002-01-17 02:51:08 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2002-01-17 02:51:08 (GMT) |
| commit | ce1f89bf15dec76c7845f7678f3c12cb56e0bc4a (patch) | |
| tree | d1bca9b72fc871427a4ff99b533c6944f1d241a6 /win | |
| parent | 227452e329f8e69279bc9ab93f21995b7249fab3 (diff) | |
| download | tk-ce1f89bf15dec76c7845f7678f3c12cb56e0bc4a.zip tk-ce1f89bf15dec76c7845f7678f3c12cb56e0bc4a.tar.gz tk-ce1f89bf15dec76c7845f7678f3c12cb56e0bc4a.tar.bz2 | |
* unix/configure: Regen.
* unix/tcl.m4: Update from Tcl.
* win/configure: Regen.
* win/tcl.m4: Update from Tcl.
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 13 | ||||
| -rw-r--r-- | win/tcl.m4 | 11 |
2 files changed, 15 insertions, 9 deletions
diff --git a/win/configure b/win/configure index 2b9af79..7a2db6f 100755 --- a/win/configure +++ b/win/configure @@ -1185,7 +1185,7 @@ echo "configure:1181: checking compiler flags" >&5 SHLIB_LD="" SHLIB_LD_LIBS="" LIBS="" - LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32" + LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32" STLIB_LD='${AR} cr' RC_OUT=-o RC_TYPE= @@ -1326,7 +1326,7 @@ echo "configure:1181: checking compiler flags" >&5 SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no" SHLIB_LD_LIBS="user32.lib advapi32.lib" LIBS="user32.lib advapi32.lib" - LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib" + LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib" RC_OUT=-fo RC_TYPE=-r RC_INCLUDE=-i @@ -1553,11 +1553,14 @@ echo "configure:1548: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 echo "$ac_t""file not found" 1>&6 fi - # The eval is required to do the TCL_DBGX substitution in the - # TCL_LIB_FILE variable. + # + # eval is required to do the TCL_DBGX substitution + # eval TCL_LIB_FILE=${TCL_LIB_FILE} eval TCL_LIB_FLAG=${TCL_LIB_FLAG} + eval TCL_STUB_LIB_FILE=${TCL_STUB_LIB_FILE} + eval TCL_STUB_LIB_FLAG=${TCL_STUB_LIB_FLAG} @@ -1566,7 +1569,7 @@ echo "configure:1548: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:1570: checking for tclsh" >&5 +echo "configure:1573: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -106,11 +106,14 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [ AC_MSG_RESULT([file not found]) fi - # The eval is required to do the TCL_DBGX substitution in the - # TCL_LIB_FILE variable. + # + # eval is required to do the TCL_DBGX substitution + # eval TCL_LIB_FILE=${TCL_LIB_FILE} eval TCL_LIB_FLAG=${TCL_LIB_FLAG} + eval TCL_STUB_LIB_FILE=${TCL_STUB_LIB_FILE} + eval TCL_STUB_LIB_FLAG=${TCL_STUB_LIB_FLAG} AC_SUBST(TCL_BIN_DIR) AC_SUBST(TCL_SRC_DIR) @@ -347,7 +350,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ SHLIB_LD="" SHLIB_LD_LIBS="" LIBS="" - LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32" + LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32" STLIB_LD='${AR} cr' RC_OUT=-o RC_TYPE= @@ -488,7 +491,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no" SHLIB_LD_LIBS="user32.lib advapi32.lib" LIBS="user32.lib advapi32.lib" - LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib" + LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib" RC_OUT=-fo RC_TYPE=-r RC_INCLUDE=-i |