subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1627276 - in /subversion/trunk: autogen.sh build/buildcheck.sh
Date Wed, 24 Sep 2014 10:58:13 GMT
Author: philip
Date: Wed Sep 24 10:58:12 2014
New Revision: 1627276

URL: http://svn.apache.org/r1627276
Log:
* buildcheck.sh: Look for libtoolize rather than libtool, add some
   more candidate names.

* autogen.sh: Add more candidate names to match buildcheck.sh.

Patch by: Helmut Grohne <helmut{_AT_}subdivi.de>
          me

Modified:
    subversion/trunk/autogen.sh
    subversion/trunk/build/buildcheck.sh

Modified: subversion/trunk/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/autogen.sh?rev=1627276&r1=1627275&r2=1627276&view=diff
==============================================================================
--- subversion/trunk/autogen.sh (original)
+++ subversion/trunk/autogen.sh Wed Sep 24 10:58:12 2014
@@ -59,7 +59,7 @@ done
 # ### APR's libtool. deferring to a second round of change...
 #
 
-libtoolize="`./build/PrintPath glibtoolize libtoolize libtoolize15`"
+libtoolize="`./build/PrintPath glibtoolize libtoolize glibtoolize1 libtoolize15 libtoolize14`"
 lt_major_version=`$libtoolize --version 2>/dev/null | sed -e 's/^[^0-9]*//' -e 's/\..*//'
-e '/^$/d' -e 1q`
 
 if [ "x$libtoolize" = "x" ]; then

Modified: subversion/trunk/build/buildcheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/build/buildcheck.sh?rev=1627276&r1=1627275&r2=1627276&view=diff
==============================================================================
--- subversion/trunk/build/buildcheck.sh (original)
+++ subversion/trunk/build/buildcheck.sh Wed Sep 24 10:58:12 2014
@@ -97,14 +97,14 @@ else
   esac
 fi
 
-libtool=${LIBTOOL:-`./build/PrintPath glibtool libtool libtool15`}
+libtoolize=${LIBTOOLIZE:-`./build/PrintPath glibtoolize libtoolize glibtoolize1 libtoolize15
libtoolize14`}
 # Extract the libtool version number: everything from the first number in
 # the version text until a hyphen or space.
-lt_pversion=`$libtool --version 2>/dev/null |
+lt_pversion=`$libtoolize --version 2>/dev/null |
   sed -e 's/^[^0-9]*//' -e 's/[- ].*//' -e '/^$/d' |
   sed -e 1q`
 if test -z "$lt_pversion"; then
-  echo "buildcheck: libtool not found."
+  echo "buildcheck: libtoolize not found."
   echo "            You need libtool version $LIBTOOL_WANTED_VERSION or newer installed"
   exit 1
 fi



Mime
View raw message