common/autoconf/libraries.m4

*** 1,7 ****
  #
! # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 874,889 ****
      AC_SUBST(LLVM_LDFLAGS)
      AC_SUBST(LLVM_LIBS)
    fi
  
    # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
!   if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x; then
      LIBCXX="/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
    fi
  
    # TODO better (platform agnostic) test
!   if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$GCC" = xyes; then
      LIBCXX="-lstdc++"
    fi
  
    AC_SUBST(LIBCXX)
  ])
--- 874,900 ----
      AC_SUBST(LLVM_LDFLAGS)
      AC_SUBST(LLVM_LIBS)
    fi
  
    # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
!   if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then
      LIBCXX="/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
    fi
  
    # TODO better (platform agnostic) test
!   if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$TOOLCHAIn_TYPE" = xgcc; then
      LIBCXX="-lstdc++"
    fi
  
    AC_SUBST(LIBCXX)
  ])
+ 
+ AC_DEFUN_ONCE([LIB_SETUP_ON_WINDOWS],
+ [
+   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+     TOOLCHAIN_SETUP_MSVCR_DLL
+     BASIC_DEPRECATED_ARG_WITH([dxsdk])
+     BASIC_DEPRECATED_ARG_WITH([dxsdk-lib])
+     BASIC_DEPRECATED_ARG_WITH([dxsdk-include])
+   fi
+   AC_SUBST(MSVCR_DLL)
+ ])