summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-05-01 21:24:53 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-05-01 21:24:53 (GMT)
commite6e9627f66e10f8d898258948552187b2d8788b5 (patch)
treef34077befe26cfa60de74aec1624f5ae45cbfbe3
parent4bd02302707c68cb317cbfd47d49d2ca2effd485 (diff)
downloadtk-e6e9627f66e10f8d898258948552187b2d8788b5.zip
tk-e6e9627f66e10f8d898258948552187b2d8788b5.tar.gz
tk-e6e9627f66e10f8d898258948552187b2d8788b5.tar.bz2
sync with Tcl's upgrade of dde/reg packages
-rwxr-xr-xunix/configure2
-rwxr-xr-xunix/tcl.m42
-rw-r--r--win/rules.vc8
3 files changed, 6 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure
index 8e323ec..7b307db 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2385,7 +2385,7 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
if test "x${TCL_THREADS}" = "x0"; then
{ echo "configure: error: CYGWIN compile is only supported with --enable-threads" 1>&2; exit 1; }
fi
- if test "x${SHARED_BUILD}" = "x1" -a ! -f "../win/tcldde12.dll" -a ! -f "../win/tk84.dll"; then
+ if test "x${SHARED_BUILD}" = "x1" -a ! -f "../win/tcldde13.dll" -a ! -f "../win/tk84.dll"; then
{ echo "configure: error: Please configure and make the ../win directory first." 1>&2; exit 1; }
fi
;;
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 360b3a1..db64bbe 100755
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1229,7 +1229,7 @@ dnl AC_CHECK_TOOL(AR, ar)
if test "x${TCL_THREADS}" = "x0"; then
AC_MSG_ERROR([CYGWIN compile is only supported with --enable-threads])
fi
- if test "x${SHARED_BUILD}" = "x1" -a ! -f "../win/tcldde12.dll" -a ! -f "../win/tk84.dll"; then
+ if test "x${SHARED_BUILD}" = "x1" -a ! -f "../win/tcldde13.dll" -a ! -f "../win/tk84.dll"; then
AC_MSG_ERROR([Please configure and make the ../win directory first.])
fi
;;
diff --git a/win/rules.vc b/win/rules.vc
index 69f9fc8..568071c 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -491,8 +491,8 @@ TCLSH = "$(_INSTALLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX).exe"
TCLSTUBLIB = "$(_INSTALLDIR)\lib\tclstub$(TCL_VERSION).lib"
TCLIMPLIB = "$(_INSTALLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib"
TCL_LIBRARY = $(_INSTALLDIR)\lib
-TCLREGLIB = "$(_INSTALLDIR)\lib\tclreg11$(SUFX:t=).lib"
-TCLDDELIB = "$(_INSTALLDIR)\lib\tcldde12$(SUFX:t=).lib"
+TCLREGLIB = "$(_INSTALLDIR)\lib\tclreg12$(SUFX:t=).lib"
+TCLDDELIB = "$(_INSTALLDIR)\lib\tcldde13$(SUFX:t=).lib"
COFFBASE = \must\have\tcl\sources\to\build\this\target
TCLTOOLSDIR = \must\have\tcl\sources\to\build\this\target
!else
@@ -500,8 +500,8 @@ TCLSH = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX).exe"
TCLSTUBLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib"
TCLIMPLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib"
TCL_LIBRARY = $(_TCLDIR)\library
-TCLREGLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg11$(SUFX:t=).lib"
-TCLDDELIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde12$(SUFX:t=).lib"
+TCLREGLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg12$(SUFX:t=).lib"
+TCLDDELIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde13$(SUFX:t=).lib"
COFFBASE = "$(_TCLDIR)\win\coffbase.txt"
TCLTOOLSDIR = $(_TCLDIR)\tools
!endif