diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-28 13:27:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-28 13:27:43 (GMT) |
| commit | c728c451a4b3e2e2166d49547c49f5e4132b8652 (patch) | |
| tree | e80f950b22e0684bc52e4c2917eec9dded867cc1 /unix/configure.in | |
| parent | 59051e407213c7a42b2427b17338c30336b82845 (diff) | |
| parent | d244749081139cd68d5004e67c30a2ec6f99682e (diff) | |
| download | tk-c728c451a4b3e2e2166d49547c49f5e4132b8652.zip tk-c728c451a4b3e2e2166d49547c49f5e4132b8652.tar.gz tk-c728c451a4b3e2e2166d49547c49f5e4132b8652.tar.bz2 | |
Link cygwin wish.exe with win32 tk.dll, only in combination with --enable-shared
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/configure.in b/unix/configure.in index 0b519a6..5759e04 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -722,10 +722,10 @@ 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 -ltk86 \${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}" + WISH_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG} \${WISH_LIBS}" fi TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" fi |