Make buildconf work on FreeBSD, where several libtool versions can coexist

(libtool13, libtool14, ...), and the libtool.m4 file is named after the
libtool version, too (.../aclocal/libtool14.m4).


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@125162 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 3 deletions

diff --git a/buildconf b/buildconf
index b16441f4a..789ea682d 100755
--- a/buildconf
+++ b/buildconf
@@ -45,8 +45,9 @@ $libtoolize --copy --automake
 if [ -f libtool.m4 ]; then 
    ltfile=`pwd`/libtool.m4
 else
-   ltpath=`dirname $libtoolize`
-   ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+   libtool=`build/PrintPath glibtool libtool libtool15 libtool14`
+   ltpath=`dirname $libtool`
+   ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/`basename $libtool`.m4}
 fi
   
 if [ ! -f $ltfile ]; then
@@ -54,7 +55,7 @@ if [ ! -f $ltfile ]; then
     exit 1
 fi
 
-echo "buildconf: Using libtool.m4 at ${ltfile}."
+echo "buildconf: Using libtool.m4 from ${ltfile}."
 
 cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4