[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#65142: 30.0.50; configure --without-all does not disable some featur
From: |
Ulrich Müller |
Subject: |
bug#65142: 30.0.50; configure --without-all does not disable some features |
Date: |
Tue, 08 Aug 2023 09:54:20 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
Ever since --with-json was changed from using OPTION_DEFAULT_ON to
OPTION_DEFAULT_IFAVAILABLE (commit 43091e6c5069), option --without-all
will no longer disable it. The same applies to --with-tree-sitter.
$ ./configure --without-all
[...]
Does Emacs use -ljansson? yes
Does Emacs use -ltree-sitter? yes
[...]
The following patch should fix the problem:
>From b5ef99a3f06005524ab12a1bd6a2a6dfa7689ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
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.
---
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
])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 @@ AC_DEFUN
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
--
2.41.0
- bug#65142: 30.0.50; configure --without-all does not disable some features,
Ulrich Müller <=