summaryrefslogtreecommitdiffstats
path: root/unix/configure
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-18 13:58:52 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-18 13:58:52 (GMT)
commit0af1f3e468baaf1b8cf6bc13452d1fc8f0a265f5 (patch)
tree8668327c4cb9f7d8850220ff8c55343432a94c9f /unix/configure
parent1f5fc183bc9b936bcf73c6138df3b699567545d6 (diff)
downloadtk-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/configure')
-rwxr-xr-xunix/configure13
1 files changed, 9 insertions, 4 deletions
diff --git a/unix/configure b/unix/configure
index 654b67d..91fbde7 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5213,10 +5213,15 @@ echo "$as_me: error: ${CC} is not a cygwin compiler." >&2;}
echo "$as_me: error: CYGWIN compile is only supported with --enable-threads" >&2;}
{ (exit 1); exit 1; }; }
fi
- if test "x${SHARED_BUILD}" = "x1" -a ! -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; }; }
+ 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*)