diff options
Diffstat (limited to 'debian/patches/libtoolize_check.patch')
| -rw-r--r-- | debian/patches/libtoolize_check.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/debian/patches/libtoolize_check.patch b/debian/patches/libtoolize_check.patch new file mode 100644 index 0000000..d1dd558 --- /dev/null +++ b/debian/patches/libtoolize_check.patch @@ -0,0 +1,27 @@ +From: Helmut Grohne <helmut@subdivi.de> +Subject: check for libtoolize rather than libtool +Last-Update: 2014-09-19 + +libtool is now in package libtool-bin, but apr only needs libtoolize. + +--- apr.orig/build/buildcheck.sh ++++ apr/build/buildcheck.sh +@@ -39,13 +39,13 @@ 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` ++# Require libtoolize 1.4 or newer ++if test -z "$libtoolize"; then ++ libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` + fi +-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` ++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 |