summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-22 12:32:35 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-22 12:32:35 (GMT)
commit5ba547a4497459c886c9ec265c9b95bd75bb4fab (patch)
tree1dd2c29a3942f8c3b456a938ce85dfa921a078d9
parente8469505b13e2af380977e581f42402073a2136f (diff)
downloadtk-5ba547a4497459c886c9ec265c9b95bd75bb4fab.zip
tk-5ba547a4497459c886c9ec265c9b95bd75bb4fab.tar.gz
tk-5ba547a4497459c886c9ec265c9b95bd75bb4fab.tar.bz2
[Bug 1844430]: cygwin make fails in 8.4.14-8.5b3
-rw-r--r--ChangeLog5
-rwxr-xr-xunix/tcl.m46
-rw-r--r--win/Makefile.in4
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ed87a4..51aa0ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-22 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/Makefile.in: [Bug 1844430]: cygwin make fails in 8.4.14-8.5b3
+ * unix/tcl.m4: Sync with Tcl version.
+
2012-06-10 Jan Nijtmans <nijtmans@users.sf.net>
* library/*.tcl: [Bug 3534137]: $tcl_platform(platform) !=
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 2391a41..7161c91 100755
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1226,6 +1226,12 @@ dnl AC_CHECK_TOOL(AR, ar)
if test "$ac_cv_cygwin" = "no"; then
AC_MSG_ERROR([${CC} is not a cygwin compiler.])
fi
+ if test "x${TCL_THREADS}" = "x0"; then
+ AC_MSG_ERROR([CYGWIN compile is only supported with --enable-threads])
+ fi
+ if test ! -f "../win/tcldde12.dll" -a ! -f "../win/tk84.dll"; then
+ AC_MSG_ERROR([Please configure and make the ../win directory first.])
+ fi
;;
dgux*)
SHLIB_CFLAGS="-K PIC"
diff --git a/win/Makefile.in b/win/Makefile.in
index fad8a8d..752236f 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -374,13 +374,13 @@ $(ROOT_DIR)/doc/man.macros:
doc: $(ROOT_DIR)/doc/man.macros
-winhelp: $(TCL_SRC_DIR_NATIVE)/tools/man2help.tcl $(MAN2TCL)
+winhelp: $(TCL_SRC_DIR)/tools/man2help.tcl $(MAN2TCL)
$(TCL_EXE) "$(TCL_SRC_DIR_NATIVE)/tools/man2help.tcl" tcl "$(VER)" $(CORE_DOCS)
$(COPY) "$(TCL_BIN_DIR)/tcl.hpj" ./
hcw /c /e tcl.hpj
$(COPY) ./tcl$(VER).cnt ./TCL$(VER).HLP "$(TCL_SRC_DIR_NATIVE)/tools/"
-$(MAN2TCL): $(TCL_SRC_DIR_NATIVE)/tools/man2tcl.c
+$(MAN2TCL): $(TCL_SRC_DIR)/tools/man2tcl.c
$(CC) $(CFLAGS_OPTIMIZE) $(MAN2TCLFLAGS) -o $(MAN2TCL) "$(TCL_SRC_DIR_NATIVE)/tools/man2tcl.c"
# Specifying TESTFLAGS on the command line is the standard way to pass