diff -r 2f973e405849 -r 7dea4754bd99 common/autoconf/jdk-options.m4
--- a/common/autoconf/jdk-options.m4	Mon Jun 01 14:46:02 2020 +0100
+++ b/common/autoconf/jdk-options.m4	Wed Jun 03 01:17:10 2020 +0100
@@ -437,22 +437,30 @@
   #
   # Enable or disable JFR
   #
-  AC_MSG_CHECKING([whether to build jfr])
-  AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--enable-jfr],
-      [Enable Java Flight Recorder support @<:@disabled@:>@])],,
+  AC_MSG_CHECKING([whether to build JFR])
+  AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr],
+      [Disable Java Flight Recorder support @<:@enabled@:>@])],,
       [enable_jfr=auto])
-  if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
+  if test "x$enable_jfr" = "xno"; then
     ENABLE_JFR=false
-  elif test "x$enable_jfr" = "xyes" ; then
+  elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
     if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
-      AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
+      if test "x$enable_jfr" = "xyes"; then
+        AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
+      else
+        ENABLE_JFR=false
+      fi
     elif test "x$OPENJDK_TARGET_OS" = xaix; then
-      AC_MSG_ERROR([AIX does not support JFR])
+      if test "x$enable_jfr" = "xyes"; then
+        AC_MSG_ERROR([AIX does not support JFR])
+      else
+        ENABLE_JFR=false
+      fi
     else
       ENABLE_JFR=true
     fi
   else
-    AC_MSG_ERROR([--enable-jfr must either be set to yes or no])
+    AC_MSG_ERROR([--enable-jfr must be set to either yes or no])
   fi
   AC_MSG_RESULT([$ENABLE_JFR])
   AC_SUBST(ENABLE_JFR)