| Brad Bishop | 00e122a | 2019-10-05 11:10:57 -0400 | [diff] [blame] | 1 | From: Helmut Grohne <helmut@subdivi.de> |
| 2 | Subject: check for libtoolize rather than libtool |
| 3 | Last-Update: 2014-09-19 |
| 4 | |
| 5 | libtool is now in package libtool-bin, but apr only needs libtoolize. |
| 6 | |
| 7 | Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/apr/1.6.5-1/debian/patches/libtoolize_check.patch ] |
| 8 | |
| 9 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 10 | |
| 11 | --- apr.orig/build/buildcheck.sh |
| 12 | +++ apr/build/buildcheck.sh |
| 13 | @@ -39,11 +39,11 @@ fi |
| 14 | # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a |
| 15 | # output is multiline from 1.5 onwards |
| 16 | |
| 17 | -# Require libtool 1.4 or newer |
| 18 | -libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` |
| 19 | -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` |
| 20 | +# Require libtoolize 1.4 or newer |
| 21 | +libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` |
| 22 | +lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` |
| 23 | if test -z "$lt_pversion"; then |
| 24 | - echo "buildconf: libtool not found." |
| 25 | + echo "buildconf: libtoolize not found." |
| 26 | echo " You need libtool version 1.4 or newer installed" |
| 27 | echo " to build APR from SVN." |
| 28 | res=1 |