From 17835709bc55657b7af1f7c99b3f572b819cf97e Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Tue, 7 Feb 2023 07:04:00 +0000 Subject: [PATCH] check for libtoolize rather than libtool libtool is now in package libtool-bin, but apr only needs libtoolize. Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/apr/1.6.5-1/debian/patches/libtoolize_check.patch ] Signed-off-by: Robert Yang --- build/buildcheck.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 44921b5..08bc8a8 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -39,13 +39,11 @@ fi # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a # output is multiline from 1.5 onwards -# Require libtool 1.4 or newer -if test -z "$libtool"; then - libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` -fi -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` +# Require libtoolize 1.4 or newer +libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` +lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` if test -z "$lt_pversion"; then - echo "buildconf: libtool not found." + echo "buildconf: libtoolize not found." echo " You need libtool version 1.4 or newer installed" echo " to build APR from SVN." res=1