summaryrefslogtreecommitdiffstats
path: root/debian/patches/libtoolize_check.patch
blob: d1dd558dd001b4542e199978e95bdfc95fd24524 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
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