summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-23 07:51:01 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-23 07:51:01 (GMT)
commit6972fca8ea0a1fd9ffcd3b196fff2f38aa9bd73b (patch)
treebd74e836d8222f8382220ad4b9e6136a84e0e455 /unix
parent41b819e2be9dd110354f34eb007b7ebea51665fa (diff)
parentb7b0031e696bba64a463f88625a0ac16f7270279 (diff)
downloadtk-6972fca8ea0a1fd9ffcd3b196fff2f38aa9bd73b.zip
tk-6972fca8ea0a1fd9ffcd3b196fff2f38aa9bd73b.tar.gz
tk-6972fca8ea0a1fd9ffcd3b196fff2f38aa9bd73b.tar.bz2
[Bug 1844430]: cygwin make fails in 8.4.14-8.5b3
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure10
-rw-r--r--unix/tcl.m46
2 files changed, 16 insertions, 0 deletions
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"