diff options
author | martin <martin@13f79535-47bb-0310-9956-ffa450edef68> | 2005-01-14 10:20:31 +0000 |
---|---|---|
committer | martin <martin@13f79535-47bb-0310-9956-ffa450edef68> | 2005-01-14 10:20:31 +0000 |
commit | dae8ad5c39d3a9b323a4952b02f1175b5dd25287 (patch) | |
tree | efe3bbcfc08af52abf624d712ac2774f7a8ea165 | |
parent | d0f64627f4b8921a31754d6c2382f359ef7b91f1 (diff) | |
download | libapr-dae8ad5c39d3a9b323a4952b02f1175b5dd25287.tar.gz |
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
-rwxr-xr-x | buildconf | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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 |