aboutsummaryrefslogtreecommitdiffstats
path: root/www/apache22/files/patch-srclib:apr:build:buildcheck.sh
blob: a6641eed7acbb9fbf0fb59cd762dbcde551ddcb7 (plain) (blame)
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
--- srclib/apr/build/buildcheck.sh.orig Fri Jun 17 00:53:05 2005
+++ srclib/apr/build/buildcheck.sh  Sun Sep 24 15:18:38 2006
@@ -2,6 +2,7 @@
 
 echo "buildconf: checking installation..."
 
+if [ "x${FULLBUILD}" = "xon" ] ; then
 # any python
 python=`build/PrintPath python`
 if test -z "$python"; then
@@ -13,6 +14,7 @@
 py_version=`python -c 'import sys; print sys.version' 2>&1|sed 's/ .*//;q'`
 echo "buildconf: python version $py_version (ok)"
 fi
+fi
 
 # autoconf 2.50 or newer
 ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'`
@@ -38,7 +40,7 @@
 # output is multiline from 1.5 onwards
 
 # Require libtool 1.4 or newer
-libtool=`build/PrintPath glibtool libtool libtool15 libtool14`
+libtool=${LIBTOOL}
 lt_pversion=`$libtool --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."