From 8344145f253d46eef22d958079d6e22a25dff24d Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Tue, 23 Nov 2021 13:40:36 -0300 Subject: [PATCH] build: Normalize HAVE_CONTRIB_INSTALL Added on commit 8d8686af2 ("Make installation of contrib scripts configurable", 2017-04-13). Remove redundant argument to AS_IF and make it look more like the other nearby AS_IF calls. --- configure | 5 ++--- configure.ac | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 3d5c9d1618c..da886a541d6 100755 --- a/configure +++ b/configure @@ -3812,9 +3812,8 @@ if test "${enable_contrib_install+set}" = set; then : fi if test "x$enable_contrib_install" = "xno"; then : - HAVE_CONTRIB_INSTALL="no" -else - HAVE_CONTRIB_INSTALL="yes" + + HAVE_CONTRIB_INSTALL="no" fi diff --git a/configure.ac b/configure.ac index 2870148cf26..bf501506dca 100644 --- a/configure.ac +++ b/configure.ac @@ -225,10 +225,9 @@ HAVE_CONTRIB_INSTALL="yes" AC_SUBST([HAVE_CONTRIB_INSTALL]) AC_ARG_ENABLE([contrib-install], [AS_HELP_STRING([--enable-contrib-install], [install contrib scripts])]) -AS_IF([test "x$enable_contrib_install" = "xno"], - [HAVE_CONTRIB_INSTALL="no"], - [HAVE_CONTRIB_INSTALL="yes"] -) +AS_IF([test "x$enable_contrib_install" = "xno"], [ + HAVE_CONTRIB_INSTALL="no" +]) HAVE_FORCE_NONEWPRIVS="" AC_SUBST([HAVE_FORCE_NONEWPRIVS])