From 1a36b3b6702a8f018d30691db436338ea595d52c Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 23 Dec 2004 14:27:04 +0000
Subject: Don't remove library options from the command line quite so
 aggressively. Allow the configure process a chance to detect on its own
 whether the named library exists or not by allowing those library options to
 pass through to the compiler on a test compile.  A package that *needs* those
 library options to be removed can add the appropriate rm: BUILDLINK_TRANSFORM
 command to its package Makefile.

---
 mk/db1.builtin.mk    | 3 +--
 mk/dlopen.builtin.mk | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mk/db1.builtin.mk b/mk/db1.builtin.mk
index aef3e187fcd..c92e9984895 100644
--- a/mk/db1.builtin.mk
+++ b/mk/db1.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: db1.builtin.mk,v 1.9 2004/12/11 00:32:16 jlam Exp $
+# $NetBSD: db1.builtin.mk,v 1.10 2004/12/23 14:27:04 jlam Exp $
 
 .for _lib_ in db db1
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -70,7 +70,6 @@ BUILDLINK_LDADD.db1=	-ldb1
 BUILDLINK_TRANSFORM+=	l:db:db1
 .    else
 BUILDLINK_LDADD.db1=	# empty
-BUILDLINK_TRANSFORM+=	rm:-ldb
 .    endif
 BUILDLINK_LIBS.db1=	${BUILDLINK_LDADD.db1}
 
diff --git a/mk/dlopen.builtin.mk b/mk/dlopen.builtin.mk
index a254e94f302..ec71b96834c 100644
--- a/mk/dlopen.builtin.mk
+++ b/mk/dlopen.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dlopen.builtin.mk,v 1.7 2004/12/02 15:04:16 jlam Exp $
+# $NetBSD: dlopen.builtin.mk,v 1.8 2004/12/23 14:27:04 jlam Exp $
 
 .for _lib_ in dl
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -71,8 +71,6 @@ BUILDLINK_PREFIX.dl=	/usr
 # scripts already check for -ldl themselves.
 #
 BUILDLINK_LDADD.dl=	-ldl
-.    else
-BUILDLINK_TRANSFORM+=	rm:-ldl
 .    endif
 .    if !empty(_DLOPEN_REQUIRE_PTHREADS:M[yY][eE][sS])
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-- 
cgit v1.2.3