diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-11-18 13:58:52 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-11-18 13:58:52 (GMT) |
| commit | 0af1f3e468baaf1b8cf6bc13452d1fc8f0a265f5 (patch) | |
| tree | 8668327c4cb9f7d8850220ff8c55343432a94c9f /unix/tcl.m4 | |
| parent | 1f5fc183bc9b936bcf73c6138df3b699567545d6 (diff) | |
| download | tk-0af1f3e468baaf1b8cf6bc13452d1fc8f0a265f5.zip tk-0af1f3e468baaf1b8cf6bc13452d1fc8f0a265f5.tar.gz tk-0af1f3e468baaf1b8cf6bc13452d1fc8f0a265f5.tar.bz2 | |
Cygwin: In stead 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 f484989..e9795b8 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1263,8 +1263,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/tcldde13.dll" -a ! -f "../win/tk85.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*) |