comparison common/autoconf/toolchain_windows.m4 @ 890:13ddc5c3ebfc

Merge
author jlaskey
date Sat, 02 Mar 2013 10:28:16 -0400
parents 98a7af257bee
children 52741ab7c601
comparison
equal deleted inserted replaced
1:5725be8d0f88 2:e8d3c5f48cbe
46 if test "x$VS_ENV_CMD" = x; then 46 if test "x$VS_ENV_CMD" = x; then
47 WIN_SDK_BASE="$1" 47 WIN_SDK_BASE="$1"
48 METHOD="$2" 48 METHOD="$2"
49 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(WIN_SDK_BASE) 49 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(WIN_SDK_BASE)
50 if test -d "$WIN_SDK_BASE"; then 50 if test -d "$WIN_SDK_BASE"; then
51 if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then 51 # There have been cases of partial or broken SDK installations. A missing
52 # lib dir is not going to work.
53 if test ! -d "$WIN_SDK_BASE/../lib"; then
54 AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
55 AC_MSG_NOTICE([Warning: Installation is broken, lib dir is missing. Ignoring])
56 elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
52 AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD]) 57 AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
53 VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd" 58 VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
54 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 59 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
55 VS_ENV_ARGS="/x86" 60 VS_ENV_ARGS="/x86"
56 else 61 else