svn commit: r125883 - /apr/apr/trunk/buildconf

[pq...@apache.org]

Author: pquerna
Date: Thu Jan 20 20:04:32 2005
New Revision: 125883

URL: http://svn.apache.org/viewcvs?view=rev&rev=125883
Log:
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.

Modified:
   apr/apr/trunk/buildconf

Modified: apr/apr/trunk/buildconf
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/buildconf?view=diff&rev=125883&p1=apr/apr/trunk/buildconf&r1=125882&p2=apr/apr/trunk/buildconf&r2=125883
==============================================================================
--- apr/apr/trunk/buildconf	(original)
+++ apr/apr/trunk/buildconf	Thu Jan 20 20:04:32 2005
@@ -45,9 +45,8 @@
 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 @@
     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