From efb3ef0fe07a1fe8c713921ceba74f476c8aa40b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Tue, 8 Aug 2023 08:34:43 +0200 Subject: [PATCH] Disable json and tree-sitter with --without-all * configure.ac (OPTION_DEFAULT_IFAVAILABLE): Disable the option if --without-all was specified. (Bug#65142) --- configure.ac | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index e01465c2af0..de602371f7b 100644 --- a/configure.ac +++ b/configure.ac @@ -305,7 +305,8 @@ AC_DEFUN([OPTION_DEFAULT_OFF], [dnl ])dnl dnl OPTION_DEFAULT_IFAVAILABLE(NAME, HELP-STRING) -dnl Create a new --with option that defaults to 'ifavailable'. +dnl Create a new --with option that defaults to 'ifavailable', +dnl unless it is overriden by $with_features being equal to 'no'. dnl NAME is the base name of the option. The shell variable with_NAME dnl will be set to either the user's value (if the option is dnl specified; 'yes' for a plain --with-NAME) or to 'ifavailable' (if the @@ -315,10 +316,12 @@ dnl characters with "_". dnl HELP-STRING is the help text for the option. AC_DEFUN([OPTION_DEFAULT_IFAVAILABLE], [dnl AC_ARG_WITH([$1],[AS_HELP_STRING([--with-$1],[$2])],[],[dnl - m4_bpatsubst([with_$1], [[^0-9a-z]], [_])=ifavailable])dnl + AS_IF([test "$with_features" != no], + [m4_bpatsubst([with_$1], [[^0-9a-z]], [_])=ifavailable], + [m4_bpatsubst([with_$1], [[^0-9a-z]], [_])=no])dnl + ])dnl ])dnl - dnl OPTION_DEFAULT_ON(NAME, HELP-STRING) dnl Create a new --with option that defaults to $with_features. dnl NAME is the base name of the option. The shell variable with_NAME