Revert r125162 since Martin did not reply to dev@apr.

Something like this needs to be done to support FreeBSD's libtool
setup, but I need to be able to build on my machine.


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

1 files changed, 3 insertions, 4 deletions

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