diff options
| author | dgp <dgp@users.sourceforge.net> | 2015-12-10 13:38:45 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2015-12-10 13:38:45 (GMT) |
| commit | 87dca641534768e549dd5ff1d43f7111ae4ef578 (patch) | |
| tree | 00c84bb0c26550694f45ebb9331efe2c9b5bd4bb /win | |
| parent | a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a (diff) | |
| parent | e82200cb0ca4389ea75f8ae0c2096358a985c14e (diff) | |
| download | tk-87dca641534768e549dd5ff1d43f7111ae4ef578.zip tk-87dca641534768e549dd5ff1d43f7111ae4ef578.tar.gz tk-87dca641534768e549dd5ff1d43f7111ae4ef578.tar.bz2 | |
merge 8.5
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 12 | ||||
| -rw-r--r-- | win/tcl.m4 | 7 |
2 files changed, 6 insertions, 13 deletions
diff --git a/win/configure b/win/configure index 5c16b5b..3d4bf2f 100755 --- a/win/configure +++ b/win/configure @@ -3859,15 +3859,11 @@ echo "${ECHO_T}using shared flags" >&6 ;; esac if test ! -d "${PATH64}" ; then - { echo "$as_me:$LINENO: WARNING: Could not find 64-bit $MACHINE SDK to enable 64bit mode" >&5 -echo "$as_me: WARNING: Could not find 64-bit $MACHINE SDK to enable 64bit mode" >&2;} - { echo "$as_me:$LINENO: WARNING: Ensure latest Platform SDK is installed" >&5 -echo "$as_me: WARNING: Ensure latest Platform SDK is installed" >&2;} - do64bit="no" - else - echo "$as_me:$LINENO: result: Using 64-bit $MACHINE mode" >&5 -echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6 + { echo "$as_me:$LINENO: WARNING: Could not find 64-bit $MACHINE SDK" >&5 +echo "$as_me: WARNING: Could not find 64-bit $MACHINE SDK" >&2;} fi + echo "$as_me:$LINENO: result: Using 64-bit $MACHINE mode" >&5 +echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6 fi LIBS="user32.lib advapi32.lib ws2_32.lib" @@ -815,12 +815,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ;; esac if test ! -d "${PATH64}" ; then - AC_MSG_WARN([Could not find 64-bit $MACHINE SDK to enable 64bit mode]) - AC_MSG_WARN([Ensure latest Platform SDK is installed]) - do64bit="no" - else - AC_MSG_RESULT([ Using 64-bit $MACHINE mode]) + AC_MSG_WARN([Could not find 64-bit $MACHINE SDK]) fi + AC_MSG_RESULT([ Using 64-bit $MACHINE mode]) fi LIBS="user32.lib advapi32.lib ws2_32.lib" |