From 00dff6e3bce72cc444c0602e13cf346a3340746b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Dec 2023 16:08:37 +0100 Subject: [PATCH] Stop using $EGREP in configure.ac unnecessarily We don't have DISABLED_UTILS or DISABLED_DEMOS variables, so it's useless to exclude them from the makefiles list -- just stop doing it. This fixes a problem with using EGREP without preceding AC_PROG_EGREP with autoconf 2.72, as EGREP is not defined any longer with this version. See #24168. --- configure | 5 +---- configure.ac | 7 +------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 9fd73062eb..310adf5aa9 100755 --- a/configure +++ b/configure @@ -42983,10 +42983,7 @@ for subdir in $SUBDIRS; do makefiles="samples/$subtree/Makefile.in $makefiles" done else - disabled_var=DISABLED_`echo $subdir | tr '[a-z]' '[A-Z]'` - eval "disabled=\$$disabled_var" - disabled=/`echo X $disabled | sed 's@ @/|/@g'`/ - makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"` + makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` fi else if test ${subdir} = "samples"; then diff --git a/configure.ac b/configure.ac index 6063333767..c608f9f4cf 100644 --- a/configure.ac +++ b/configure.ac @@ -8048,12 +8048,7 @@ for subdir in $SUBDIRS; do done else dnl assume that everything compiles for utils &c - dnl any that shouldn't be built can be added to - dnl DISABLED_UTILS, DISABLED_DEMOS - disabled_var=DISABLED_`echo $subdir | tr '[[a-z]]' '[[A-Z]]'` - eval "disabled=\$$disabled_var" - disabled=/`echo X $disabled | sed 's@ @/|/@g'`/ - makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"` + makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` fi else dnl we build wxBase only