summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-23 07:46:50 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-23 07:46:50 (GMT)
commitb7b0031e696bba64a463f88625a0ac16f7270279 (patch)
treeccdc1560deb0db177c12201d53476e580de547a9
parent9389cc709a38a39f1dbd50e744342ee2590269f8 (diff)
parent5398ca174f8af33143ae56fccf3fc15c6fb926f9 (diff)
downloadtk-b7b0031e696bba64a463f88625a0ac16f7270279.zip
tk-b7b0031e696bba64a463f88625a0ac16f7270279.tar.gz
tk-b7b0031e696bba64a463f88625a0ac16f7270279.tar.bz2
[Bug 1844430]: cygwin make fails in 8.4.14-8.5b3
-rw-r--r--ChangeLog6
-rwxr-xr-xunix/configure10
-rw-r--r--unix/tcl.m46
-rw-r--r--win/Makefile.in4
4 files changed, 24 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 17aaf28..da7caba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+ * unix/configure: autoconf-2.13
+
2012-06-15 Donal K. Fellows <dkf@users.sf.net>
* generic/ttk/ttkTreeview.c (unshareObj): [Bug 3535362]: Changed name
diff --git a/unix/configure b/unix/configure
index 434d3aa..1655748 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5207,6 +5207,16 @@ echo "${ECHO_T}$ac_cv_cygwin" >&6
echo "$as_me: error: ${CC} is not a cygwin compiler." >&2;}
{ (exit 1); exit 1; }; }
fi
+ if test "x${TCL_THREADS}" = "x0"; then
+ { { echo "$as_me:$LINENO: error: CYGWIN compile is only supported with --enable-threads" >&5
+echo "$as_me: error: CYGWIN compile is only supported with --enable-threads" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test ! -f "../win/tcldde13.dll" -a ! -f "../win/tk85.dll"; then
+ { { echo "$as_me:$LINENO: error: Please configure and make the ../win directory first." >&5
+echo "$as_me: error: Please configure and make the ../win directory first." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
;;
dgux*)
SHLIB_CFLAGS="-K PIC"
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 4e0ac62..390f4ec 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1260,6 +1260,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
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/tcldde13.dll" -a ! -f "../win/tk85.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 bb63a3d..799e5ee 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -413,13 +413,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