summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-05-14 18:12:07 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-05-14 18:12:07 (GMT)
commitdbfc77554dd5d43b6cdcad134e4d8beaba804e1c (patch)
treeb94e46a8d7f5c21a0e513a2e46d4159ec4d15cc7 /unix
parent57b17e48d54e1c117a6c09b2047e3429312a3406 (diff)
parente6e9627f66e10f8d898258948552187b2d8788b5 (diff)
downloadtk-dbfc77554dd5d43b6cdcad134e4d8beaba804e1c.zip
tk-dbfc77554dd5d43b6cdcad134e4d8beaba804e1c.tar.gz
tk-dbfc77554dd5d43b6cdcad134e4d8beaba804e1c.tar.bz2
merge 8.4
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure2
-rwxr-xr-xunix/tcl.m42
2 files changed, 2 insertions, 2 deletions
diff --git a/unix/configure b/unix/configure
index 3bdc120..42a79d0 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
;;