diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-26 19:52:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-26 19:52:53 (GMT) |
| commit | 46750f2e46cf9cadc294597b96a205809a26bc34 (patch) | |
| tree | 32c805b23cc7845019f17f70fc3dae715d54237c /unix/configure.in | |
| parent | 5398ca174f8af33143ae56fccf3fc15c6fb926f9 (diff) | |
| download | tk-46750f2e46cf9cadc294597b96a205809a26bc34.zip tk-46750f2e46cf9cadc294597b96a205809a26bc34.tar.gz tk-46750f2e46cf9cadc294597b96a205809a26bc34.tar.bz2 | |
link cygwin wish8.6 with tk86.dll (configuration part)
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/unix/configure.in b/unix/configure.in index b5f2770..677ce03 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -496,12 +496,17 @@ else # libdir must be a fully qualified path and not ${exec_prefix}/lib eval libdir="$libdir" if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then - if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" - else - eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" - fi - TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" + if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" + 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}" + else + WISH_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG} \${WISH_LIBS}" + fi TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" else TK_BUILD_EXP_FILE="lib.exp" @@ -509,9 +514,11 @@ else if test "$GCC" = "yes" ; then TK_BUILD_LIB_SPEC="-Wl,-bI:`pwd`/${TK_BUILD_EXP_FILE} -L`pwd`" + WISH_BUILD_LIB_SPEC="-Wl,-bI:`pwd`/${TK_BUILD_EXP_FILE} -L`pwd`" TK_LIB_SPEC="-Wl,-bI:${libdir}/${TK_EXP_FILE} -L`pwd`" else TK_BUILD_LIB_SPEC="-bI:`pwd`/${TK_BUILD_EXP_FILE}" + WISH_BUILD_LIB_SPEC="-bI:`pwd`/${TK_BUILD_EXP_FILE}" TK_LIB_SPEC="-bI:${libdir}/${TK_EXP_FILE}" fi fi |