1.1 --- a/common/autoconf/jdk-options.m4 Mon Jun 01 14:46:02 2020 +0100
1.2 +++ b/common/autoconf/jdk-options.m4 Wed Jun 03 01:17:10 2020 +0100
1.3 @@ -437,22 +437,30 @@
1.4 #
1.5 # Enable or disable JFR
1.6 #
1.7 - AC_MSG_CHECKING([whether to build jfr])
1.8 - AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--enable-jfr],
1.9 - [Enable Java Flight Recorder support @<:@disabled@:>@])],,
1.10 + AC_MSG_CHECKING([whether to build JFR])
1.11 + AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr],
1.12 + [Disable Java Flight Recorder support @<:@enabled@:>@])],,
1.13 [enable_jfr=auto])
1.14 - if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
1.15 + if test "x$enable_jfr" = "xno"; then
1.16 ENABLE_JFR=false
1.17 - elif test "x$enable_jfr" = "xyes" ; then
1.18 + elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
1.19 if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
1.20 - AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
1.21 + if test "x$enable_jfr" = "xyes"; then
1.22 + AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
1.23 + else
1.24 + ENABLE_JFR=false
1.25 + fi
1.26 elif test "x$OPENJDK_TARGET_OS" = xaix; then
1.27 - AC_MSG_ERROR([AIX does not support JFR])
1.28 + if test "x$enable_jfr" = "xyes"; then
1.29 + AC_MSG_ERROR([AIX does not support JFR])
1.30 + else
1.31 + ENABLE_JFR=false
1.32 + fi
1.33 else
1.34 ENABLE_JFR=true
1.35 fi
1.36 else
1.37 - AC_MSG_ERROR([--enable-jfr must either be set to yes or no])
1.38 + AC_MSG_ERROR([--enable-jfr must be set to either yes or no])
1.39 fi
1.40 AC_MSG_RESULT([$ENABLE_JFR])
1.41 AC_SUBST(ENABLE_JFR)
