This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".
The branch, master has been updated
via a4628e58ddfcfd1e4cb3b063a89ebfc0e473358b (commit)
from 05f8c6818388750d60160a8cd917d3895552fada (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=a4628e58ddfcfd1e4cb3b063a89ebfc0e473358b
commit a4628e58ddfcfd1e4cb3b063a89ebfc0e473358b
Author: Jim Meyering <[email protected]>
Date: Sun Apr 6 18:45:29 2025 -0700
build: avoid using pkg-config's pkg.m4 serial 12
* bootstrap.conf (bootstrap_post_import_hook): Add code to ensure we
do not use pkg.m4 serial 12. For the record, I've temporarily copied
the version of pkg.m4 from grep-3.11 into $(aclocal --print-ac-dir),
so that when I run bootstrap, it always gets that serial 11 version.
Reported by Bruno Haible in
https://lists.gnu.org/r/grep-devel/2025-04/msg00005.html
diff --git a/bootstrap.conf b/bootstrap.conf
index 2fc2947..f1cf72f 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -157,17 +157,22 @@ bootstrap_post_import_hook ()
test -s "$ac_dir/dirlist" && ac_dir=$ac_dir:`tr '\n' : < "$ac_dir/dirlist"`
oIFS=$IFS
IFS=:
+ local found=0
for dir in \
$ACLOCAL_PATH $ac_dir /usr/share/aclocal ''
do
IFS=$oIFS
if test -n "$dir" && test -r "$dir/pkg.m4"; then
cp "$dir/pkg.m4" m4/pkg.m4
- return
+ found=1
+ break
fi
done
IFS=$oIFS
- die 'Cannot find pkg.m4; perhaps you need to install pkg-config'
+ test $found = 0 \
+ && die 'Cannot find pkg.m4; perhaps you need to install pkg-config'
+ local url=https://lists.gnu.org/r/grep-devel/2025-04/msg00005.html
+ grep '^# serial 12' m4/pkg.m4 && die "do not use pkg.m4 serial 12; see $url"
}
bootstrap_epilogue()
-----------------------------------------------------------------------
Summary of changes:
bootstrap.conf | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
grep
