apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject svn commit: r125162 - /apr/apr/trunk/buildconf
Date Fri, 14 Jan 2005 10:25:49 GMT
Author: martin
Date: Fri Jan 14 02:20:31 2005
New Revision: 125162

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

Modified:
   apr/apr/trunk/buildconf

Modified: apr/apr/trunk/buildconf
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/buildconf?view=diff&rev=125162&p1=apr/apr/trunk/buildconf&r1=125161&p2=apr/apr/trunk/buildconf&r2=125162
==============================================================================
--- apr/apr/trunk/buildconf	(original)
+++ apr/apr/trunk/buildconf	Fri Jan 14 02:20:31 2005
@@ -45,8 +45,9 @@
 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 @@
     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
 

Mime
View raw message