libtool location fixes

--nextPart1384200.4BE0Xd0PRq
Content-Type: multipart/mixed;
  boundary="Boundary-01=_ow0rDG7PG3sVp/J"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--Boundary-01=_ow0rDG7PG3sVp/J
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

In current FreeBSD, there are yet more foolish places that libtool may be=20
installed; this patch makes it clearer where the list of places-to-search i=
s=20
and how to extend it for more foolish changes.

This patch also removes the use of $ld for the loader in final build steps =
in=20
the libtool module -- it seems $LD is no longer defined in the scope of thi=
s=20
module, leading to errors otherwise.

=2D-=20
These are your friends - Adem
    GPG: FEA2 A3FE Adriaan de Groot

--Boundary-01=_ow0rDG7PG3sVp/J
Content-Type: text/x-diff;
  charset="us-ascii";
  name="modules.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="modules.diff"

diff -u --exclude=3D*.pyc aap/Exec-cvs/modules/libtool.aap kpilot/kpilot/tr=
unk/aap/modules/libtool.aap
=2D-- aap/Exec-cvs/modules/libtool.aap	Wed Nov 23 23:47:01 2005
+++ kpilot/kpilot/trunk/aap/modules/libtool.aap	Sat Dec 24 17:30:00 2005
@@ -18,7 +18,10 @@
=20
 @if not _top.get("top_srcdir"):
     _top.top_srcdir =3D .
=2D@for libtool in [ _no.get("LIBTOOL"), os.environ.get("LIBTOOL"), "libtoo=
l", os.path.join(_top.get("top_srcdir"), "libtool"), "libtool15" ] :
+
+@libtool_locations =3D [ _no.get("LIBTOOL"), os.environ.get("LIBTOOL"), "l=
ibtool", os.path.join(_top.get("top_srcdir"), "libtool") ]
+@libtool_locations.append( "/usr/local/gnu-autotools/bin/libtool" )
+@for libtool in libtool_locations :
     @if libtool:
         @try:
             :syseval $libtool --version 2>&1 | :assign libtool_ver
@@ -123,11 +126,11 @@
 :action ltbuild default=20
       # $LTLIBS is set, use libtool for linking
       :sys $LIBTOOL --mode=3Dlink --tag=3DC
=2D              $ld $LDFLAGS `cflags_normal()` -o $target $source $?LTLIBS=
 $?LIBS
+              $CC $LDFLAGS `cflags_normal()` -o $target $source $?LTLIBS $=
?LIBS
=20
 :action ltbuild_cxx default=20
       # $LTLIBS is set, use libtool for linking
       :sys $LIBTOOL --mode=3Dlink --tag=3DCXX
=2D              $ld $LDFLAGS `cflags_normal()` -o $target $source $?LTLIBS=
 $?LIBS
+              $CXX $LDFLAGS `cflags_normal()` -o $target $source $?LTLIBS =
$?LIBS
=20
 # vim: set sw=3D4 sts=3D4 tw=3D79 et :

--Boundary-01=_ow0rDG7PG3sVp/J--

--nextPart1384200.4BE0Xd0PRq
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (FreeBSD)

iD8DBQBDr0wodqzuAf6io/4RAi3qAJwNcBxzDSQACycui08NopYM7wuqSgCdGfB+
wqUhxPaZ0bO7R0ZABxajPmA=
=ZpS0
-----END PGP SIGNATURE-----

--nextPart1384200.4BE0Xd0PRq--


-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click