diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-28 11:41:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-28 11:41:29 (GMT) |
| commit | d244749081139cd68d5004e67c30a2ec6f99682e (patch) | |
| tree | c1a8afe6d156883bccbdaabb82b6a4a8ce13459d /unix/configure | |
| parent | 022dcdf1391c87fa59c87ed6efb740f84b4ae95d (diff) | |
| parent | 5bf292f9ab0ddda2f59f652e94185832af078740 (diff) | |
| download | tk-d244749081139cd68d5004e67c30a2ec6f99682e.zip tk-d244749081139cd68d5004e67c30a2ec6f99682e.tar.gz tk-d244749081139cd68d5004e67c30a2ec6f99682e.tar.bz2 | |
Link cygwin wish.exe with win32 tk.dll, only in combination with --enable-shared
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 9a3eec4..67e7cb3 100755 --- a/unix/configure +++ b/unix/configure @@ -5212,7 +5212,7 @@ 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 ! -f "../win/tcldde13.dll" -a ! -f "../win/tk85.dll"; then + 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; }; } @@ -11389,8 +11389,8 @@ else TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" 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${TK_MAJOR_VERSION}${TK_MINOR_VERSION} \${TCL_LIB_SPEC}" else WISH_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG} \${WISH_LIBS}" fi |