Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/basics.m4	Tue Sep 17 19:06:17 2013 -0700
     1.2 +++ b/common/autoconf/basics.m4	Wed Sep 18 12:37:54 2013 +0200
     1.3 @@ -203,6 +203,15 @@
     1.4      fi
     1.5  ])
     1.6  
     1.7 +# Register a --with argument but mark it as deprecated
     1.8 +# $1: The name of the with argument to deprecate, not including --with-
     1.9 +AC_DEFUN([BASIC_DEPRECATED_ARG_WITH],
    1.10 +[
    1.11 +  AC_ARG_WITH($1, [AS_HELP_STRING([--with-$1],
    1.12 +      [Deprecated. Option is kept for backwards compatibility and is ignored])],
    1.13 +      [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])])
    1.14 +])
    1.15 +
    1.16  AC_DEFUN_ONCE([BASIC_INIT],
    1.17  [
    1.18  # Save the original command line. This is passed to us by the wrapper configure script.

     2.1 --- a/common/autoconf/generated-configure.sh	Tue Sep 17 19:06:17 2013 -0700
     2.2 +++ b/common/autoconf/generated-configure.sh	Wed Sep 18 12:37:54 2013 +0200
     2.3 @@ -1032,6 +1032,9 @@
     2.4  with_override_jdk
     2.5  with_import_hotspot
     2.6  with_msvcr_dll
     2.7 +with_dxsdk
     2.8 +with_dxsdk_lib
     2.9 +with_dxsdk_include
    2.10  with_jtreg
    2.11  with_extra_cflags
    2.12  with_extra_cxxflags
    2.13 @@ -1786,6 +1789,12 @@
    2.14                            source
    2.15    --with-msvcr-dll        copy this msvcr100.dll into the built JDK (Windows
    2.16                            only) [probed]
    2.17 +  --with-dxsdk            Deprecated. Option is kept for backwards
    2.18 +                          compatibility and is ignored
    2.19 +  --with-dxsdk-lib        Deprecated. Option is kept for backwards
    2.20 +                          compatibility and is ignored
    2.21 +  --with-dxsdk-include    Deprecated. Option is kept for backwards
    2.22 +                          compatibility and is ignored
    2.23    --with-jtreg            Regression Test Harness [probed]
    2.24    --with-extra-cflags     extra flags to be used when compiling jdk c-files
    2.25    --with-extra-cxxflags   extra flags to be used when compiling jdk c++-files
    2.26 @@ -3135,6 +3144,10 @@
    2.27  
    2.28  
    2.29  
    2.30 +# Register a --with argument but mark it as deprecated
    2.31 +# $1: The name of the with argument to deprecate, not including --with-
    2.32 +
    2.33 +
    2.34  
    2.35  
    2.36  # Test that variable $1 denoting a program is not empty. If empty, exit with an error.
    2.37 @@ -3805,7 +3818,7 @@
    2.38  #CUSTOM_AUTOCONF_INCLUDE
    2.39  
    2.40  # Do not change or remove the following line, it is needed for consistency checks:
    2.41 -DATE_WHEN_GENERATED=1379077060
    2.42 +DATE_WHEN_GENERATED=1379500606
    2.43  
    2.44  ###############################################################################
    2.45  #
    2.46 @@ -17584,6 +17597,33 @@
    2.47    fi
    2.48  
    2.49  
    2.50 +
    2.51 +
    2.52 +# Check whether --with-dxsdk was given.
    2.53 +if test "${with_dxsdk+set}" = set; then :
    2.54 +  withval=$with_dxsdk; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-dxsdk is deprecated and will be ignored." >&5
    2.55 +$as_echo "$as_me: WARNING: Option --with-dxsdk is deprecated and will be ignored." >&2;}
    2.56 +fi
    2.57 +
    2.58 +
    2.59 +
    2.60 +
    2.61 +# Check whether --with-dxsdk-lib was given.
    2.62 +if test "${with_dxsdk_lib+set}" = set; then :
    2.63 +  withval=$with_dxsdk_lib; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-dxsdk-lib is deprecated and will be ignored." >&5
    2.64 +$as_echo "$as_me: WARNING: Option --with-dxsdk-lib is deprecated and will be ignored." >&2;}
    2.65 +fi
    2.66 +
    2.67 +
    2.68 +
    2.69 +
    2.70 +# Check whether --with-dxsdk-include was given.
    2.71 +if test "${with_dxsdk_include+set}" = set; then :
    2.72 +  withval=$with_dxsdk_include; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-dxsdk-include is deprecated and will be ignored." >&5
    2.73 +$as_echo "$as_me: WARNING: Option --with-dxsdk-include is deprecated and will be ignored." >&2;}
    2.74 +fi
    2.75 +
    2.76 +
    2.77  fi
    2.78  
    2.79  

     3.1 --- a/common/autoconf/toolchain.m4	Tue Sep 17 19:06:17 2013 -0700
     3.2 +++ b/common/autoconf/toolchain.m4	Wed Sep 18 12:37:54 2013 +0200
     3.3 @@ -176,6 +176,9 @@
     3.4  [
     3.5  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
     3.6    TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
     3.7 +  BASIC_DEPRECATED_ARG_WITH([dxsdk])
     3.8 +  BASIC_DEPRECATED_ARG_WITH([dxsdk-lib])
     3.9 +  BASIC_DEPRECATED_ARG_WITH([dxsdk-include])
    3.10  fi
    3.11  
    3.12  AC_SUBST(MSVCR_DLL)