svn commit: r742752 - in /apr/apr/trunk: build/buildcheck.sh buildconf

[ji...@apache.org]

Author: jim
Date: Mon Feb  9 21:46:28 2009
New Revision: 742752

URL: http://svn.apache.org/viewvc?rev=742752&view=rev
Log:
With the release if libtool 2.x, most port managers now install
as glibtool1... so prefer that.

Modified:
    apr/apr/trunk/build/buildcheck.sh
    apr/apr/trunk/buildconf

Modified: apr/apr/trunk/build/buildcheck.sh
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/buildcheck.sh?rev=742752&r1=742751&r2=742752&view=diff
==============================================================================
--- apr/apr/trunk/build/buildcheck.sh (original)
+++ apr/apr/trunk/build/buildcheck.sh Mon Feb  9 21:46:28 2009
@@ -38,7 +38,7 @@
 # output is multiline from 1.5 onwards
 
 # Require libtool 1.4 or newer
-libtool=`build/PrintPath glibtool libtool libtool15 libtool14`
+libtool=`build/PrintPath glibtool1 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."

Modified: apr/apr/trunk/buildconf
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buildconf?rev=742752&r1=742751&r2=742752&view=diff
==============================================================================
--- apr/apr/trunk/buildconf (original)
+++ apr/apr/trunk/buildconf Mon Feb  9 21:46:28 2009
@@ -23,7 +23,7 @@
 #
 build/buildcheck.sh || exit 1
 
-libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize`
+libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 libtoolize`
 if [ "x$libtoolize" = "x" ]; then
     echo "libtoolize not found in path"
     exit 1