Update libtool* packages to account for libltdl split, and simplify by

moving some common things into Makefile.common.

2 files changed, 27 insertions, 2 deletions

diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 1c54e28ee98..501d6ac7f8d 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2004/05/26 13:51:07 tron Exp $
+# $NetBSD: Makefile,v 1.43 2004/10/14 19:04:56 tv Exp $
 
 .include "Makefile.common"
 
@@ -7,6 +7,9 @@ SVR4_PKGNAME=	ltool
 DEPENDS+=	${DISTNAME:S/-/-base-/}{,nb[0-9]*}:../libtool-base
 DEPENDS+=	${DISTNAME:S/-/-info-/}{,nb[0-9]*}:../libtool-info
 
+# There is no libltdl dependency here; this is deliberate, so that libltdl
+# can be updated independently of the rest of libtool.
+
 COMMENT=	Generic shared library support script
 
 NO_CONFIGURE=	yes
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 396b27a100c..22ed374192f 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2004/10/14 16:15:26 tv Exp $
+# $NetBSD: Makefile.common,v 1.55 2004/10/14 19:04:56 tv Exp $
 #
 
 DISTNAME=	libtool-1.5.10
@@ -22,3 +22,25 @@ PATCHDIR=	${.CURDIR}/../libtool/patches
 AUTOMAKE_OVERRIDE=	NO
 
 CONFIGURE_ARGS+=	-C # autoconf cache speedup
+
+.include "../../mk/bsd.prefs.mk"
+
+# The configure script persists in trying to find the path to ld, which
+# always ends up in ${BUILDLINK_DIR}.  Prevent it from caring.
+#
+CONFIGURE_ENV+=		lt_cv_path_LD=${LD:Q}
+
+# The configure script persists in trying to find the path to sed or gsed,
+# which breaks when SED is nbsed.  Tell it explicitly to use the sed
+# named by ${SED}.
+#
+CONFIGURE_ENV+=		SED=${SED:Q}
+CONFIGURE_ENV+=		lt_cv_path_SED=${SED:Q}
+
+# The configure script doesn't seem to be working out the need for -p
+# or -B, so tell it
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=		lt_cv_path_NM="nm -p"
+.elif ${OPSYS} == "IRIX"
+CONFIGURE_ENV+=		lt_cv_path_NM="nm -B"
+.endif