1.1 --- a/common/autoconf/jdk-options.m4 Tue Mar 03 12:57:18 2020 +0000
1.2 +++ b/common/autoconf/jdk-options.m4 Tue Mar 03 13:21:24 2020 +0000
1.3 @@ -438,18 +438,14 @@
1.4 # Enable or disable JFR
1.5 #
1.6 AC_MSG_CHECKING([whether to build jfr])
1.7 - AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr],
1.8 - [Disable Java Flight Recorder support @<:@enabled@:>@])],,
1.9 + AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--enable-jfr],
1.10 + [Enable Java Flight Recorder support @<:@disabled@:>@])],,
1.11 [enable_jfr=auto])
1.12 - if test "x$enable_jfr" = "xno"; then
1.13 + if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
1.14 ENABLE_JFR=false
1.15 - elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
1.16 + elif test "x$enable_jfr" = "xyes" ; then
1.17 if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
1.18 - if test "x$enable_jfr" = "xyes"; then
1.19 - AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
1.20 - else
1.21 - ENABLE_JFR=false
1.22 - fi
1.23 + AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
1.24 else
1.25 ENABLE_JFR=true
1.26 fi
