summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2003-04-03 02:04:53 (GMT)
committermdejong <mdejong>2003-04-03 02:04:53 (GMT)
commit8e95bf1faee00a740455e979fa25c531a65d80f4 (patch)
treedb65bc2bf1ba104530454b89b7b82c674e643a7c
parent415979d88766d4d576fba5f5578f46b8ca4fa2db (diff)
downloadtk-8e95bf1faee00a740455e979fa25c531a65d80f4.zip
tk-8e95bf1faee00a740455e979fa25c531a65d80f4.tar.gz
tk-8e95bf1faee00a740455e979fa25c531a65d80f4.tar.bz2
* win/configure: Regen.
* win/configure.in: Don't set TCL_DLL_FILE, TCL_LIB_FILE, TCL_STUB_LIB_FILE, TCL_STUB_LIB_FLAG, and TCL_BUILD_STUB_LIB_SPEC. These variables are already set in tclConfig.sh. [Bug 691908]
-rw-r--r--ChangeLog9
-rwxr-xr-xwin/configure7
-rw-r--r--win/configure.in9
3 files changed, 10 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index c59f7b4..2759883 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-02 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * win/configure: Regen.
+ * win/configure.in: Don't set TCL_DLL_FILE,
+ TCL_LIB_FILE, TCL_STUB_LIB_FILE, TCL_STUB_LIB_FLAG,
+ and TCL_BUILD_STUB_LIB_SPEC. These variables are
+ already set in tclConfig.sh.
+ [Bug 691908]
+
2003-03-22 Kevin Kenny <kennykb@acm.org>
* win/makefile.vc:
diff --git a/win/configure b/win/configure
index 0db2034..709a8a9 100755
--- a/win/configure
+++ b/win/configure
@@ -1758,13 +1758,6 @@ eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}"
eval "TK_STUB_LIB_FLAG=\"-ltkstub${VER}${TCL_DBGX}\""
eval "TK_BUILD_STUB_LIB_SPEC=\"-L`pwd` ${TK_STUB_LIB_FLAG}\""
-eval "TCL_DLL_FILE=\"tcl$VER${DLLSUFFIX}\""
-eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl$VER${LIBSUFFIX}\""
-
-eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${VER}${LIBSUFFIX}\""
-eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${TCL_DBGX}\""
-eval "TCL_BUILD_STUB_LIB_SPEC=\"-L`pwd` ${TCL_STUB_LIB_FLAG}\""
-
eval "DLLSUFFIX=${DLLSUFFIX}"
eval "LIBPREFIX=${LIBPREFIX}"
eval "LIBSUFFIX=${LIBSUFFIX}"
diff --git a/win/configure.in b/win/configure.in
index aea2314..a251610 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
# generate the file "configure", which is run during Tk installation
# to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.49 2003/02/15 02:21:01 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.49.2.1 2003/04/03 02:04:56 mdejong Exp $
AC_INIT(../generic/tk.h)
AC_PREREQ(2.13)
@@ -158,13 +158,6 @@ eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}"
eval "TK_STUB_LIB_FLAG=\"-ltkstub${VER}${TCL_DBGX}\""
eval "TK_BUILD_STUB_LIB_SPEC=\"-L`pwd` ${TK_STUB_LIB_FLAG}\""
-eval "TCL_DLL_FILE=\"tcl$VER${DLLSUFFIX}\""
-eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl$VER${LIBSUFFIX}\""
-
-eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${VER}${LIBSUFFIX}\""
-eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${TCL_DBGX}\""
-eval "TCL_BUILD_STUB_LIB_SPEC=\"-L`pwd` ${TCL_STUB_LIB_FLAG}\""
-
eval "DLLSUFFIX=${DLLSUFFIX}"
eval "LIBPREFIX=${LIBPREFIX}"
eval "LIBSUFFIX=${LIBSUFFIX}"