diff options
| author | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2005-01-13 13:51:14 +0000 |
|---|---|---|
| committer | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2005-01-13 13:51:14 +0000 |
| commit | db2b588e501c9d8c1a3747f835f7dfac8903472d (patch) | |
| tree | ec697a068dd6575437bfad23022958703bd6d3c3 | |
| parent | 3eff83864ebd2830ff0a706b2f692a7bc3cf4caf (diff) | |
| download | libapr-db2b588e501c9d8c1a3747f835f7dfac8903472d.tar.gz | |
* build/buildcheck.sh: Require libtool 1.4 or newer. s/Apache/APR/
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@125076 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | build/buildcheck.sh | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 10a68d128..9694ef7de 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -19,14 +19,14 @@ ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[ if test -z "$ac_version"; then echo "buildconf: autoconf not found." echo " You need autoconf version 2.50 or newer installed" -echo " to build Apache from CVS." +echo " to build APR from CVS." exit 1 fi IFS=.; set $ac_version; IFS=' ' if test "$1" = "2" -a "$2" -lt "50" || test "$1" -lt "2"; then echo "buildconf: autoconf version $ac_version found." echo " You need autoconf version 2.50 or newer installed" -echo " to build Apache from CVS." +echo " to build APR from CVS." exit 1 else echo "buildconf: autoconf version $ac_version (ok)" @@ -37,27 +37,21 @@ 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.3.3 or newer +# Require libtool 1.4 or newer libtool=`build/PrintPath glibtool libtool libtool15 libtool14` 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." echo " You need libtool version 1.3.3 or newer installed" -echo " to build Apache from CVS." +echo " to build APR from CVS." exit 1 fi lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` IFS=.; set $lt_version; IFS=' ' lt_status="good" if test "$1" = "1"; then - if test "$2" -lt "3"; then + if test "$2" -lt "4"; then lt_status="bad" - else - if test "$2" = "3"; then - if test -z "$3" -o "$3" = "1" -o "$3" = "2"; then - lt_status="bad" - fi - fi fi fi if test $lt_status = "good"; then @@ -66,7 +60,7 @@ if test $lt_status = "good"; then fi echo "buildconf: libtool version $lt_pversion found." -echo " You need libtool version 1.3.3 or newer installed" -echo " to build Apache from CVS." +echo " You need libtool version 1.4 or newer installed" +echo " to build APR from CVS." exit 1 |