From cfc5bf44589891e9321d0c790bea9e9d55b1d031 Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 5 Mar 2008 03:58:20 +0000 Subject: If the TERMCAP_TYPE isn't "curses", then also remove "-lncurses" from the command line so we don't find any system ncurses library. XXX This currently causes problems with packages using both termcap XXX (usually via readline) and curses. This will be fixed in time. --- mk/termcap.buildlink3.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mk/termcap.buildlink3.mk b/mk/termcap.buildlink3.mk index 4533ec38e33..50c9e4851cd 100644 --- a/mk/termcap.buildlink3.mk +++ b/mk/termcap.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: termcap.buildlink3.mk,v 1.2 2008/03/02 07:05:28 jlam Exp $ +# $NetBSD: termcap.buildlink3.mk,v 1.3 2008/03/05 03:58:20 jlam Exp $ # # This Makefile fragment is meant to be included by packages that require # a termcap implementation that supports the basic termcap functions: @@ -44,6 +44,9 @@ BUILD_DEFS+= TERMCAP_TYPE BUILDLINK_TRANSFORM+= rm:-l${_tcap_} . endif .endfor +.if empty(TERMCAP_TYPE:Mcurses) +BUILDLINK_TRANSFORM+= rm:-lncurses +.endif BUILDLINK_TRANSFORM+= l:termcap:${BUILDLINK_LIBNAME.termcap} .endif # TERMCAP_BUILDLINK3_MK -- cgit v1.2.3