mirror of
https://https.git.savannah.gnu.org/git/grep.git
synced 2026-01-26 15:39:06 +00:00
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
This commit is contained in:
parent
05f8c68183
commit
a4628e58dd
@ -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()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user