summaryrefslogtreecommitdiffstats
path: root/unix/configure.in
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-28 11:41:29 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-28 11:41:29 (GMT)
commitd244749081139cd68d5004e67c30a2ec6f99682e (patch)
treec1a8afe6d156883bccbdaabb82b6a4a8ce13459d /unix/configure.in
parent022dcdf1391c87fa59c87ed6efb740f84b4ae95d (diff)
parent5bf292f9ab0ddda2f59f652e94185832af078740 (diff)
downloadtk-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.in')
-rw-r--r--unix/configure.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/configure.in b/unix/configure.in
index c2421ca..a7bc887 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -687,8 +687,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