diff options
author | dgp <dgp@users.sourceforge.net> | 2015-12-10 13:38:06 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2015-12-10 13:38:06 (GMT) |
commit | 8d9d336b0c2d9142cf90919d36ef75acc1627bc8 (patch) | |
tree | f8f46b88faae21b73a37757395805c78bffbb1c6 | |
parent | 4730ab13c85c594c7d72b993b67fee80ffe28c26 (diff) | |
parent | 7b5ffe4a2c27ceb9b41422abe0a3a680dc345244 (diff) | |
download | tcl-8d9d336b0c2d9142cf90919d36ef75acc1627bc8.zip tcl-8d9d336b0c2d9142cf90919d36ef75acc1627bc8.tar.gz tcl-8d9d336b0c2d9142cf90919d36ef75acc1627bc8.tar.bz2 |
merge 8.5
-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 607cf30..3fe89bf 100755 --- a/win/configure +++ b/win/configure @@ -3722,15 +3722,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" |