From c7377530c55c67ef0aa863f2d792e05fc5e127e7 Mon Sep 17 00:00:00 2001 From: hno <> Date: Mon, 21 Oct 2002 05:08:44 +0000 Subject: [PATCH] Only invoke the automake workaround if needed --- bootstrap.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 4a3c6cf4c8..f326b58912 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -60,7 +60,10 @@ acver=`find_version autoconf ${acversions}` # Bootstrap the autotool subsystems bootstrap aclocal$amver -perl -i -p -e 's/m4_patsubst/m4_bpatsubst/g; s/m4_regexp/m4_bregex/g;' aclocal.m4 +#workaround for Automake 1.5 +if grep m4_regex aclocal.m4 >/dev/null; then + perl -ibak -p -e 's/m4_patsubst/m4_bpatsubst/g; s/m4_regexp/m4_bregexp/g;' aclocal.m4 +fi bootstrap autoheader$acver bootstrap automake$amver --foreign --add-missing bootstrap autoconf$acver -- 2.47.2