From 9dc15f17ea2c0991e31f45ca8eedc5883e81de36 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Thu, 19 Mar 2020 17:17:49 +0100
Subject: [PATCH] 8241254: Simplify usage of UTIL_DEPRECATED_ARG_ENABLE

Reviewed-by: erikj
---
 make/autoconf/util.m4 | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/make/autoconf/util.m4 b/make/autoconf/util.m4
index c1b7cc110b3..432abd81673 100644
--- a/make/autoconf/util.m4
+++ b/make/autoconf/util.m4
@@ -275,20 +275,11 @@ AC_DEFUN([UTIL_DEPRECATED_ARG_WITH],
 ###############################################################################
 # Register a --enable argument but mark it as deprecated
 # $1: The name of the with argument to deprecate, not including --enable-
-# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
-# $3: Messages to user.
 AC_DEFUN([UTIL_DEPRECATED_ARG_ENABLE],
 [
   AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1],
-      [Deprecated. Option is kept for backwards compatibility and is ignored])])
-  if test "x$enable_$2" != x; then
-    AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.])
-
-    if test "x$3" != x; then
-      AC_MSG_WARN([$3])
-    fi
-
-  fi
+      [Deprecated. Option is kept for backwards compatibility and is ignored])],
+      [AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.])])
 ])
 
 ###############################################################################