diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-06-23 07:51:01 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-06-23 07:51:01 (GMT) |
| commit | 7d2d9305fd568e2140c8b05be0d5dba522bafff8 (patch) | |
| tree | bd74e836d8222f8382220ad4b9e6136a84e0e455 | |
| parent | 1ac02bc56f1f941b2cb0024d9f321382e20d909b (diff) | |
| parent | 7cc9ef556bb14df30d81d99b008f0c96bb121b39 (diff) | |
| download | tk-7d2d9305fd568e2140c8b05be0d5dba522bafff8.zip tk-7d2d9305fd568e2140c8b05be0d5dba522bafff8.tar.gz tk-7d2d9305fd568e2140c8b05be0d5dba522bafff8.tar.bz2 | |
[Bug 1844430]: cygwin make fails in 8.4.14-8.5b3
FossilOrigin-Name: 212308f1dd867bf4ae7ff19c777b31889b8d703d
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | unix/configure | 10 | ||||
| -rw-r--r-- | unix/tcl.m4 | 6 | ||||
| -rw-r--r-- | win/Makefile.in | 4 |
4 files changed, 24 insertions, 2 deletions
@@ -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.59 + 2012-06-20 Jan Nijtmans <nijtmans@users.sf.net> * generic/tk.decls: rfe-2636558 simplification. Restore forwards diff --git a/unix/configure b/unix/configure index 132f11e..71ae670 100755 --- a/unix/configure +++ b/unix/configure @@ -4964,6 +4964,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/tcldde14.dll" -a ! -f "../win/tk86.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 85b48fa..fbb86b3 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1243,6 +1243,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/tcldde14.dll" -a ! -f "../win/tk86.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 35261b5..807be9c 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -414,13 +414,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 |