diff options
| author | Martin Kraemer <martin@apache.org> | 2005-01-14 10:20:31 +0000 |
|---|---|---|
| committer | Martin Kraemer <martin@apache.org> | 2005-01-14 10:20:31 +0000 |
| commit | 26271924f00509f9227ab0d55f60db6df2dd29eb (patch) | |
| tree | efe3bbcfc08af52abf624d712ac2774f7a8ea165 /buildconf | |
| parent | 7b4397b82eb5280c50a565e6453656636be64bf2 (diff) | |
| download | apr-26271924f00509f9227ab0d55f60db6df2dd29eb.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: https://svn.apache.org/repos/asf/apr/apr/trunk@125162 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'buildconf')
| -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 |