diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-06-28 11:13:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-06-28 11:13:54 (GMT) |
| commit | be6b681791a27e1372c84c11be3d9fa64fb7f93c (patch) | |
| tree | 2c1ed6aeac43100a4b7ad6192471250ff83bc847 /unix/configure | |
| parent | bcc3c3fdd5554bef61c933db8459503f60f74e48 (diff) | |
| download | tk-be6b681791a27e1372c84c11be3d9fa64fb7f93c.zip tk-be6b681791a27e1372c84c11be3d9fa64fb7f93c.tar.gz tk-be6b681791a27e1372c84c11be3d9fa64fb7f93c.tar.bz2 | |
Link cygwin wish.exe with win32 tk.dll, only in combination with --enable-shared
FossilOrigin-Name: 20d6976ecc4f69b3f82bc6185dbcb30ab1de2074
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/configure b/unix/configure index 8cac4c0..d7c3805 100755 --- a/unix/configure +++ b/unix/configure @@ -2385,7 +2385,7 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 if test "x${TCL_THREADS}" = "x0"; then { echo "configure: error: CYGWIN compile is only supported with --enable-threads" 1>&2; exit 1; } fi - if test ! -f "../win/tcldde12.dll" -a ! -f "../win/tk84.dll"; then + if test "x${SHARED_BUILD}" = "x1" -a ! -f "../win/tcldde12.dll" -a ! -f "../win/tk84.dll"; then { echo "configure: error: Please configure and make the ../win directory first." 1>&2; exit 1; } fi ;; @@ -6207,8 +6207,8 @@ else eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" fi TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}" - if test "${ac_cv_cygwin+set}" = set; then - WISH_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk84 \${TCL_LIB_SPEC}" + if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then + WISH_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk\${MAJOR_VERSION}\${MINOR_VERSION} \${TCL_LIB_SPEC}" else WISH_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG} \${WISH_LIBS}" fi |