diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-06-14 10:36:30 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-06-14 10:36:30 (GMT) |
| commit | 38e8caf35ee8073a69c2d3511e76636af550c6e9 (patch) | |
| tree | 31b65718f7e34f797477c5381d974b8c5fc0a07c | |
| parent | f2133b1b27f524f1da0052991d69a1a982237460 (diff) | |
| parent | 0a598b9f97bfec04f30a43127ba751d5d617ae3b (diff) | |
| download | tk-38e8caf35ee8073a69c2d3511e76636af550c6e9.zip tk-38e8caf35ee8073a69c2d3511e76636af550c6e9.tar.gz tk-38e8caf35ee8073a69c2d3511e76636af550c6e9.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).
Don't use deprecated stricmp/strnicmp any more, but underscored variant for non-GNU compilers.
FossilOrigin-Name: a31e03f91d2f0ba4a70f6ab8c7512932e03d22ed
| -rwxr-xr-x | unix/configure | 13 | ||||
| -rw-r--r-- | unix/configure.in | 13 | ||||
| -rw-r--r-- | win/tkWinPort.h | 4 |
3 files changed, 16 insertions, 14 deletions
diff --git a/unix/configure b/unix/configure index 1c33793..4d5138c 100755 --- a/unix/configure +++ b/unix/configure @@ -11357,14 +11357,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 a29600c..bf82808 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -745,14 +745,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/win/tkWinPort.h b/win/tkWinPort.h index fe31609..95cad78 100644 --- a/win/tkWinPort.h +++ b/win/tkWinPort.h @@ -70,8 +70,8 @@ #include <X11/Xutil.h> #ifndef __GNUC__ -# define strncasecmp strnicmp -# define strcasecmp stricmp +# define strncasecmp _strnicmp +# define strcasecmp _stricmp #endif #define NBBY 8 |