From 720943cff0506b4c67f33df9f0b528769c57fd23 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 21 Jul 2026 10:06:14 -0700
Subject: [PATCH] maint: prefer mcel

* bootstrap.conf (gnulib_modules): Add mcel-prefer.
(gnulib_tool_option_extras): Avoid mbiterf.
This simplifies Bison a bit, which does not need
the more-complex mbiterf.
---
 bootstrap.conf | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 03c518a7..d568eb5a 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -34,6 +34,7 @@ gnulib_modules='
   libtextstyle-optional
   linked-list
   malloc-gnu
+  mcel-prefer
   mbfile mbswidth
   obstack
   obstack-printf
@@ -80,7 +81,16 @@ XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
  --keyword=YY_ \\\
 '
 
-gnulib_tool_option_extras='--symlink --conditional-dependencies --makefile-name=gnulib.mk --automake-subdir --automake-subdir-tests --po-base=gnulib-po --po-domain=bison'
+gnulib_tool_option_extras="\
+ --automake-subdir\
+ --automake-subdir-tests\
+ --avoid=mbiterf\
+ --conditional-dependencies\
+ --makefile-name=gnulib.mk\
+ --po-base=gnulib-po\
+ --po-domain=bison\
+ --symlink\
+"
 
 gnulib_extra_files="$gnulib_extra_files build-aux/move-if-change"