diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2013-11-19 09:47:47 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2013-11-19 09:47:47 (GMT) |
| commit | feaf4ad002ee23a9f4cb663599e0bf86536ad96c (patch) | |
| tree | b11b66f6c207d9050482ce115f79f28a79603f51 /unix/tcl.m4 | |
| parent | ec55bb3d43dd06d461a358b297cfa180609edbe9 (diff) | |
| parent | cef2663a817441d70beab461d1fcdad54ef85f8b (diff) | |
| download | tcl-feaf4ad002ee23a9f4cb663599e0bf86536ad96c.zip tcl-feaf4ad002ee23a9f4cb663599e0bf86536ad96c.tar.gz tcl-feaf4ad002ee23a9f4cb663599e0bf86536ad96c.tar.bz2 | |
Cygwin: Instead of checking whether the win32 part is configured properly, just configure it when needed.
Always build the stub library first (and - on Cygwin - configure win32 properly just before building the stub library)
Diffstat (limited to 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index e3a0d15..687866e 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1236,8 +1236,15 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ 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/tcldde14.dll" -a ! -f "../win/tk86.dll"; then - AC_MSG_ERROR([Please configure and make the ../win directory first.]) + do64bit_ok=yes + if test "x${SHARED_BUILD}" = "x1"; then + echo "running cd ../win; ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args" + # The eval makes quoting arguments work. + if cd ../win; eval ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args; cd ../unix + then : + else + { echo "configure: error: configure failed for ../win" 1>&2; exit 1; } + fi fi ;; dgux*) |