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?
--
<[EMAIL PROTECTED]> | Fujitsu Siemens
Fon: +49-89-636-46021, FAX: +49-89-636-47655 | 81730 Munich, Germany
Index: buildconf
===================================================================
--- buildconf (Revision 126171)
+++ buildconf (Arbeitskopie)
@@ -46,7 +46,18 @@
ltfile=`pwd`/libtool.m4
else
ltpath=`dirname $libtoolize`
- ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+ ltpath=`cd $ltpath/../share/aclocal ; pwd`
+ # Search for a libtool.m4 file. On FreeBSD and Darwin, several versions
+ # of libtool can coexist, by renaming the command, e.g., libtoolize15 (for
V1.5)
+ # but only on FreeBSD the corresponding libtool.m4 files in ../aclocal/ are
+ # also renamed libtool15.m4 . Here we try the "normal" name(s) first, and
+ # then fall back to searching for a renamed libtool.m4 file.
+ for ltfile in ${LIBTOOL_M4} $ltpath/libtool.m4 $ltpath/`basename
$libtoolize | sed -e s/ize//g'`.m4
+ do
+ if [ -f $ltfile ]; then
+ break
+ fi
+ done
fi
if [ ! -f $ltfile ]; then
