You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ma...@apache.org on 2005/01/14 11:25:49 UTC
svn commit: r125162 - /apr/apr/trunk/buildconf
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
Re: svn commit: r125162 - /apr/apr/trunk/buildconf
Posted by Paul Querna <ch...@force-elite.com>.
martin@apache.org wrote:
> Author: martin
> Date: Fri Jan 14 02:20:31 2005
> New Revision: 125162
>
> 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).
Are you going to revist this commit martin?
This breaks my building on OS X with fink installed.
-Paul
Re: [PATCH] #2 versioned libtool.m4 files for FreeBSD
Posted by Martin Kraemer <ma...@apache.org>.
Oops - wrong dev@ -- please ignore.
Martin
--
<Ma...@Fujitsu-Siemens.com> | Fujitsu Siemens
Fon: +49-89-636-46021, FAX: +49-89-636-47655 | 81730 Munich, Germany
[PATCH] #2 versioned libtool.m4 files for FreeBSD
Posted by Martin Kraemer <ma...@apache.org>.
On Sun, 16 Jan 2005 at 10:06:16 -0800, Justin Erenkrantz wrote:
> This busts on Darwin as it uses libtool.m4 even though libtool is glibtool.
> And, libtoolize is usually going to be in the same location as libtool, so why
> the need for the extra PrintPath call?
>
> I think the right way to do it is to first check for libtool.m4, then check
> for 'echo $libtoolize | sed -e s/ize//g'.m4 in the aclocal dir. -- justin
Sorry for not reacting for so long. Here's take #2 in the attempt to
find a conservative solution for the problem that FreeBSD may have
several libtoolXX and libtool*.m4 files installed in parallel.
Justin or Paul, can you please check it on Darwin? On FreeBSD-4.10, it
seems to work ;-)
Martin
BTW: How does Darwin manage to have several libtools in parallel when
it does not rename their libtool.m4 files?
--
<Ma...@Fujitsu-Siemens.com> | Fujitsu Siemens
Fon: +49-89-636-46021, FAX: +49-89-636-47655 | 81730 Munich, Germany
[PATCH] #2 versioned libtool.m4 files for FreeBSD
Posted by Martin Kraemer <ma...@apache.org>.
On Sun, 16 Jan 2005 at 10:06:16 -0800, Justin Erenkrantz wrote:
> This busts on Darwin as it uses libtool.m4 even though libtool is glibtool.
> And, libtoolize is usually going to be in the same location as libtool, so why
> the need for the extra PrintPath call?
>
> I think the right way to do it is to first check for libtool.m4, then check
> for 'echo $libtoolize | sed -e s/ize//g'.m4 in the aclocal dir. -- justin
Sorry for not reacting for so long. Here's take #2 in the attempt to
find a conservative solution for the problem that FreeBSD may have
several libtoolXX and libtool*.m4 files installed in parallel.
Justin or Paul, can you please check it on Darwin? On FreeBSD-4.10, it
seems to work ;-)
Martin
BTW: How does Darwin manage to have several libtools in parallel when
it does not rename their libtool.m4 files?
--
<Ma...@Fujitsu-Siemens.com> | Fujitsu Siemens
Fon: +49-89-636-46021, FAX: +49-89-636-47655 | 81730 Munich, Germany
Re: svn commit: r125162 - /apr/apr/trunk/buildconf
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
On Fri, Jan 14, 2005 at 10:25:49AM -0000, martin@apache.org wrote:
> @@ -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
This busts on Darwin as it uses libtool.m4 even though libtool is glibtool.
And, libtoolize is usually going to be in the same location as libtool, so why
the need for the extra PrintPath call?
I think the right way to do it is to first check for libtool.m4, then check
for 'echo $libtoolize | sed -e s/ize//g'.m4 in the aclocal dir. -- justin