make/autoconf/jdk-options.m4

*** 628,632 ****
--- 628,665 ----
      AC_MSG_ERROR([--enable-manpages can only yes/no or empty])
    fi
  
    AC_SUBST(BUILD_MANPAGES)
  ])
+ 
+ ################################################################################
+ #
+ # Disable CDS archive generation
+ #
+ AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE],
+ [
+   AC_ARG_ENABLE([cds-archive], [AS_HELP_STRING([--disable-cds-archive],
+       [Set to disable generation of a default CDS archive in the product image @<:@enabled@:>@])])
+ 
+   AC_MSG_CHECKING([if a CDS archive should be generated])
+   if test "x$COMPILE_TYPE" = "xcross"; then
+     AC_MSG_RESULT([no, not possible with cross compilation])
+     BUILD_CDS_ARCHIVE="false"
+   elif test "x$enable_cds_archive" = "xyes"; then
+     AC_MSG_RESULT([yes, forced])
+     BUILD_CDS_ARCHIVE="true"
+   elif HOTSPOT_CHECK_JVM_VARIANT(zero); then
+     AC_MSG_RESULT([no, not possible with JVM variant zero])
+     BUILD_CDS_ARCHIVE="false"
+   elif test "x$enable_cds_archive" = "x"; then
+     AC_MSG_RESULT([yes])
+     BUILD_CDS_ARCHIVE="true"
+   elif test "x$enable_cds_archive" = "xno"; then
+     AC_MSG_RESULT([no, forced])
+     BUILD_CDS_ARCHIVE="false"
+   else
+     AC_MSG_RESULT([no])
+     AC_MSG_ERROR([--enable-cds_archive can only be yes/no or empty])
+   fi
+ 
+   AC_SUBST(BUILD_CDS_ARCHIVE)
+ ])