OpenJDK / jdk9 / jdk9
changeset 963:e9e5bd372a4e
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
Reviewed-by: erikj
| author | alanb |
|---|---|
| date | Thu, 06 Feb 2014 14:57:02 +0000 |
| parents | b160a8d22e57 |
| children | 260f2ef12254 |
| files | common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4 common/autoconf/spec.gmk.in |
| diffstat | 3 files changed, 38 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Wed Feb 05 17:24:03 2014 +0100 +++ b/common/autoconf/generated-configure.sh Thu Feb 06 14:57:02 2014 +0000 @@ -821,6 +821,7 @@ JDK_MAJOR_VERSION USER_RELEASE_SUFFIX COMPRESS_JARS +RMICONNECTOR_IIOP UNLIMITED_CRYPTO CACERTS_FILE TEST_IN_BUILD @@ -1029,6 +1030,7 @@ enable_hotspot_test_in_build with_cacerts_file enable_unlimited_crypto +enable_rmiconnector_iiop with_milestone with_update_version with_user_release_suffix @@ -1807,6 +1809,9 @@ run the Queens test after Hotspot build [disabled] --enable-unlimited-crypto Enable unlimited crypto policy [disabled] + --enable-rmiconnector-iiop + enable the JMX RMIConnector iiop transport + [disabled] --disable-debug-symbols disable generation of debug symbols [enabled] --disable-zip-debug-info disable zipping of debug-info files [enabled] @@ -4087,7 +4092,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1391160222 +DATE_WHEN_GENERATED=1391175012 ############################################################################### # @@ -19375,6 +19380,22 @@ ############################################################################### # + # --enable-rmiconnector-iiop + # + # Check whether --enable-rmiconnector-iiop was given. +if test "${enable_rmiconnector_iiop+set}" = set; then : + enableval=$enable_rmiconnector_iiop; +fi + + if test "x$enable_rmiconnector_iiop" = "xyes"; then + RMICONNECTOR_IIOP=true + else + RMICONNECTOR_IIOP=false + fi + + + ############################################################################### + # # Compress jars # COMPRESS_JARS=false
--- a/common/autoconf/jdk-options.m4 Wed Feb 05 17:24:03 2014 +0100 +++ b/common/autoconf/jdk-options.m4 Thu Feb 06 14:57:02 2014 +0000 @@ -426,6 +426,19 @@ ############################################################################### # + # --enable-rmiconnector-iiop + # + AC_ARG_ENABLE(rmiconnector-iiop, [AS_HELP_STRING([--enable-rmiconnector-iiop], + [enable the JMX RMIConnector iiop transport @<:@disabled@:>@])]) + if test "x$enable_rmiconnector_iiop" = "xyes"; then + RMICONNECTOR_IIOP=true + else + RMICONNECTOR_IIOP=false + fi + AC_SUBST(RMICONNECTOR_IIOP) + + ############################################################################### + # # Compress jars # COMPRESS_JARS=false
--- a/common/autoconf/spec.gmk.in Wed Feb 05 17:24:03 2014 +0100 +++ b/common/autoconf/spec.gmk.in Thu Feb 06 14:57:02 2014 +0000 @@ -286,6 +286,9 @@ # Enable unlimited crypto policy UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@ +# Enable RMIConnector IIOP transport +RMICONNECTOR_IIOP=@RMICONNECTOR_IIOP@ + # Necessary additional compiler flags to compile X11 X_CFLAGS:=@X_CFLAGS@ X_LIBS:=@X_LIBS@