1.1 --- a/common/autoconf/toolchain_windows.m4 Wed Oct 09 18:51:32 2013 -0700
1.2 +++ b/common/autoconf/toolchain_windows.m4 Thu Oct 10 14:58:19 2013 +0200
1.3 @@ -75,7 +75,7 @@
1.4 VCVARSFILE="vc/bin/vcvars32.bat"
1.5 else
1.6 VCVARSFILE="vc/bin/amd64/vcvars64.bat"
1.7 - fi
1.8 + fi
1.9
1.10 VS_ENV_CMD=""
1.11 VS_ENV_ARGS=""
1.12 @@ -89,7 +89,7 @@
1.13 AC_MSG_NOTICE([The path given by --with-tools-dir does not contain a valid Visual Studio installation])
1.14 AC_MSG_NOTICE([Please point to the VC/bin directory within the Visual Studio installation])
1.15 AC_MSG_ERROR([Cannot locate a valid Visual Studio installation])
1.16 - fi
1.17 + fi
1.18
1.19 if test "x$VS100COMNTOOLS" != x; then
1.20 TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$VS100COMNTOOLS/../..], [VS100COMNTOOLS variable])
1.21 @@ -118,7 +118,7 @@
1.22 # the set env variables into the spec file.
1.23 AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
1.24 [
1.25 - # Store path to cygwin link.exe to help excluding it when searching for
1.26 + # Store path to cygwin link.exe to help excluding it when searching for
1.27 # VS linker. This must be done before changing the PATH when looking for VS.
1.28 AC_PATH_PROG(CYGWIN_LINK, link)
1.29 if test "x$CYGWIN_LINK" != x; then
1.30 @@ -187,7 +187,7 @@
1.31 AC_MSG_ERROR([Cannot continue])
1.32 fi
1.33
1.34 - # Now set all paths and other env variables. This will allow the rest of
1.35 + # Now set all paths and other env variables. This will allow the rest of
1.36 # the configure script to find and run the compiler in the proper way.
1.37 AC_MSG_NOTICE([Setting extracted environment variables])
1.38 . $OUTPUT_ROOT/localdevenv.sh
1.39 @@ -198,7 +198,7 @@
1.40
1.41 # At this point, we should have corrent variables in the environment, or we can't continue.
1.42 AC_MSG_CHECKING([for Visual Studio variables])
1.43 -
1.44 +
1.45 if test "x$VCINSTALLDIR" != x || test "x$WindowsSDKDir" != x || test "x$WINDOWSSDKDIR" != x; then
1.46 if test "x$INCLUDE" = x || test "x$LIB" = x; then
1.47 AC_MSG_RESULT([present but broken])
1.48 @@ -228,7 +228,7 @@
1.49 AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.])
1.50 AC_MSG_ERROR([Cannot continue])
1.51 fi
1.52 -
1.53 +
1.54 AC_MSG_CHECKING([for msvcr100.dll])
1.55 AC_ARG_WITH(msvcr-dll, [AS_HELP_STRING([--with-msvcr-dll],
1.56 [copy this msvcr100.dll into the built JDK (Windows only) @<:@probed@:>@])])
