diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-26 20:04:20 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-26 20:04:20 (GMT) |
| commit | 7870ba909af7bdc7dcf22d3d2bac9a5c72146f6c (patch) | |
| tree | c3849bd3ead75f4cea73419285e1f7db95e5a482 /unix/configure.in | |
| parent | b7b0031e696bba64a463f88625a0ac16f7270279 (diff) | |
| parent | 46750f2e46cf9cadc294597b96a205809a26bc34 (diff) | |
| download | tk-7870ba909af7bdc7dcf22d3d2bac9a5c72146f6c.zip tk-7870ba909af7bdc7dcf22d3d2bac9a5c72146f6c.tar.gz tk-7870ba909af7bdc7dcf22d3d2bac9a5c72146f6c.tar.bz2 | |
link cygwin wish8.6 with tk86.dll (configuration part)
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/unix/configure.in b/unix/configure.in index 996195e..4d16ac0 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -650,6 +650,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then TK_LIB_FILE="Tk" TK_LIB_FLAG="-framework Tk" TK_BUILD_LIB_SPEC="-F`pwd | sed -e 's/ /\\\\ /g'` -framework Tk" + WISH_BUILD_LIB_SPEC="-F`pwd | sed -e 's/ /\\\\ /g'` -framework Tk \${WISH_LIBS}" TK_LIB_SPEC="-F${libdir} -framework Tk" libdir="${libdir}/Tk.framework/Versions/\${VERSION}" TK_LIBRARY="${libdir}/Resources/Scripts" @@ -686,6 +687,11 @@ 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}" + 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}" fi @@ -756,6 +762,7 @@ AC_SUBST(TK_SHARED_BUILD) AC_SUBST(LD_LIBRARY_PATH_VAR) AC_SUBST(TK_BUILD_LIB_SPEC) +AC_SUBST(WISH_BUILD_LIB_SPEC) AC_SUBST(TCL_STUB_FLAGS) AC_SUBST(XINCLUDES) |