equal
deleted
inserted
replaced
246 [ |
246 [ |
247 POSSIBLE_MSVCR_DLL="$1" |
247 POSSIBLE_MSVCR_DLL="$1" |
248 METHOD="$2" |
248 METHOD="$2" |
249 if test -e "$POSSIBLE_MSVCR_DLL"; then |
249 if test -e "$POSSIBLE_MSVCR_DLL"; then |
250 AC_MSG_NOTICE([Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD]) |
250 AC_MSG_NOTICE([Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD]) |
251 |
251 |
252 # Need to check if the found msvcr is correct architecture |
252 # Need to check if the found msvcr is correct architecture |
253 AC_MSG_CHECKING([found msvcr100.dll architecture]) |
253 AC_MSG_CHECKING([found msvcr100.dll architecture]) |
254 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` |
254 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` |
255 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
255 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
256 # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit" |
256 # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit" |
289 TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$with_msvcr_dll], [--with-msvcr-dll]) |
289 TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$with_msvcr_dll], [--with-msvcr-dll]) |
290 if test "x$MSVCR_DLL" = x; then |
290 if test "x$MSVCR_DLL" = x; then |
291 AC_MSG_ERROR([Could not find a proper msvcr100.dll as specified by --with-msvcr-dll]) |
291 AC_MSG_ERROR([Could not find a proper msvcr100.dll as specified by --with-msvcr-dll]) |
292 fi |
292 fi |
293 fi |
293 fi |
294 |
294 |
295 if test "x$MSVCR_DLL" = x; then |
295 if test "x$MSVCR_DLL" = x; then |
296 # Probe: Using well-known location from Visual Studio 10.0 |
296 # Probe: Using well-known location from Visual Studio 10.0 |
297 if test "x$VCINSTALLDIR" != x; then |
297 if test "x$VCINSTALLDIR" != x; then |
298 CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR" |
298 CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR" |
299 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VC_INSTALL_DIR) |
299 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VC_INSTALL_DIR) |
309 if test "x$MSVCR_DLL" = x; then |
309 if test "x$MSVCR_DLL" = x; then |
310 # Probe: Check in the Boot JDK directory. |
310 # Probe: Check in the Boot JDK directory. |
311 POSSIBLE_MSVCR_DLL="$BOOT_JDK/bin/msvcr100.dll" |
311 POSSIBLE_MSVCR_DLL="$BOOT_JDK/bin/msvcr100.dll" |
312 TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in Boot JDK]) |
312 TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in Boot JDK]) |
313 fi |
313 fi |
314 |
314 |
315 if test "x$MSVCR_DLL" = x; then |
315 if test "x$MSVCR_DLL" = x; then |
316 # Probe: Look in the Windows system32 directory |
316 # Probe: Look in the Windows system32 directory |
317 CYGWIN_SYSTEMROOT="$SYSTEMROOT" |
317 CYGWIN_SYSTEMROOT="$SYSTEMROOT" |
318 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_SYSTEMROOT) |
318 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_SYSTEMROOT) |
319 POSSIBLE_MSVCR_DLL="$CYGWIN_SYSTEMROOT/system32/msvcr100.dll" |
319 POSSIBLE_MSVCR_DLL="$CYGWIN_SYSTEMROOT/system32/msvcr100.dll" |
320 TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in SYSTEMROOT]) |
320 TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in SYSTEMROOT]) |
321 fi |
321 fi |
331 POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x86/ | $HEAD --lines 1` |
331 POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x86/ | $HEAD --lines 1` |
332 fi |
332 fi |
333 TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [search of VS100COMNTOOLS]) |
333 TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [search of VS100COMNTOOLS]) |
334 fi |
334 fi |
335 fi |
335 fi |
336 |
336 |
337 if test "x$MSVCR_DLL" = x; then |
337 if test "x$MSVCR_DLL" = x; then |
338 # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now. |
338 # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now. |
339 # (This was the original behaviour; kept since it might turn up something) |
339 # (This was the original behaviour; kept since it might turn up something) |
340 if test "x$CYGWIN_VC_INSTALL_DIR" != x; then |
340 if test "x$CYGWIN_VC_INSTALL_DIR" != x; then |
341 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
341 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
345 if test "x$POSSIBLE_MSVCR_DLL" = x; then |
345 if test "x$POSSIBLE_MSVCR_DLL" = x; then |
346 # We're grasping at straws now... |
346 # We're grasping at straws now... |
347 POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $HEAD --lines 1` |
347 POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $HEAD --lines 1` |
348 fi |
348 fi |
349 fi |
349 fi |
350 |
350 |
351 TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [search of VCINSTALLDIR]) |
351 TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [search of VCINSTALLDIR]) |
352 fi |
352 fi |
353 fi |
353 fi |
354 |
354 |
355 if test "x$MSVCR_DLL" = x; then |
355 if test "x$MSVCR_DLL" = x; then |
356 AC_MSG_CHECKING([for msvcr100.dll]) |
356 AC_MSG_CHECKING([for msvcr100.dll]) |
357 AC_MSG_RESULT([no]) |
357 AC_MSG_RESULT([no]) |
358 AC_MSG_ERROR([Could not find msvcr100.dll. Please specify using --with-msvcr-dll.]) |
358 AC_MSG_ERROR([Could not find msvcr100.dll. Please specify using --with-msvcr-dll.]) |
359 fi |
359 fi |