diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-06-14 09:22:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-06-14 09:22:04 (GMT) |
| commit | 4c294ff3b5099deeba4be3372a8f77c1ab8cf918 (patch) | |
| tree | 4982c7a2c897860fd3ef069f30b9b6ef0344ac89 | |
| parent | 71be3cf0c0222a9f6162438ad15ddad657340701 (diff) | |
| download | tk-4c294ff3b5099deeba4be3372a8f77c1ab8cf918.zip tk-4c294ff3b5099deeba4be3372a8f77c1ab8cf918.tar.gz tk-4c294ff3b5099deeba4be3372a8f77c1ab8cf918.tar.bz2 | |
Static Cygwin wish.exe cannot link with win32's static libtk85.a (because it expects a different runtime), so configure shouldn't even try to do this.
(On a dynamic wish.exe this works, this is exactly how wish can run even without X11)
FossilOrigin-Name: 22a9f6858515a22da2ae5592a179e42687c8447d
| -rwxr-xr-x | unix/configure | 13 | ||||
| -rw-r--r-- | unix/configure.in | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/unix/configure b/unix/configure index 28f564b..0a5a862 100755 --- a/unix/configure +++ b/unix/configure @@ -11476,14 +11476,15 @@ else fi # libdir must be a fully qualified path and not ${exec_prefix}/lib eval libdir="$libdir" - if test "${ac_cv_cygwin}" != "yes" -a "${TCL_LIB_VERSIONS_OK}" = "ok"; then - TK_LIB_FLAG="-ltk${TK_VERSION}" - else - TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" - fi if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then - TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION} \${TCL_LIB_SPEC}" + TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" + TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}" else + if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + TK_LIB_FLAG="-ltk${TK_VERSION}" + else + TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" + fi TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}" fi TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" diff --git a/unix/configure.in b/unix/configure.in index febc702..89efe52 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -720,14 +720,15 @@ else fi # libdir must be a fully qualified path and not ${exec_prefix}/lib eval libdir="$libdir" - if test "${ac_cv_cygwin}" != "yes" -a "${TCL_LIB_VERSIONS_OK}" = "ok"; then - TK_LIB_FLAG="-ltk${TK_VERSION}" - else - TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" - fi if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then - TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION} \${TCL_LIB_SPEC}" + TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" + TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}" else + if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + TK_LIB_FLAG="-ltk${TK_VERSION}" + else + TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" + fi TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}" fi TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" |