summaryrefslogtreecommitdiff
path: root/mk/termcap.builtin.mk
diff options
context:
space:
mode:
authorroy <roy>2010-02-07 09:46:13 +0000
committerroy <roy>2010-02-07 09:46:13 +0000
commit2c9842b9e38b90cfddc8d02ffd793d5c655a9427 (patch)
treee127d13b38ec1ea7da4df3eef026d073e9e916cf /mk/termcap.builtin.mk
parent436f4ec821e576b775a51658fa13b42c032be86a (diff)
downloadpkgsrc-2c9842b9e38b90cfddc8d02ffd793d5c655a9427.tar.gz
Add builtin for working out if we have terminfo installed natively.
Diffstat (limited to 'mk/termcap.builtin.mk')
-rw-r--r--mk/termcap.builtin.mk11
1 files changed, 7 insertions, 4 deletions
diff --git a/mk/termcap.builtin.mk b/mk/termcap.builtin.mk
index 42c99c8bfaf..a9d966a1205 100644
--- a/mk/termcap.builtin.mk
+++ b/mk/termcap.builtin.mk
@@ -1,8 +1,8 @@
-# $NetBSD: termcap.builtin.mk,v 1.6 2009/03/20 19:25:01 joerg Exp $
+# $NetBSD: termcap.builtin.mk,v 1.7 2010/02/07 09:46:14 roy Exp $
BUILTIN_PKG:= termcap
-BUILTIN_FIND_LIBS:= curses termcap termlib tinfo
+BUILTIN_FIND_LIBS:= terminfo curses termcap termlib tinfo
BUILTIN_FIND_FILES_VAR:= H_TERM H_TERMCAP H_TERMLIB
BUILTIN_FIND_FILES.H_TERM:= /usr/include/term.h
BUILTIN_FIND_GREP.H_TERM:= tgetent
@@ -19,7 +19,8 @@ BUILTIN_FIND_GREP.H_TERMLIB:= tgetent
###
.if !defined(IS_BUILTIN.termcap)
IS_BUILTIN.termcap= no
-. if !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) || \
+. if !empty(BUILTIN_LIB_FOUND.terminfo:M[yY[eE][sS]) || \
+ !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) || \
!empty(BUILTIN_LIB_FOUND.termcap:M[yY][eE][sS]) || \
!empty(BUILTIN_LIB_FOUND.termlib:M[yY][eE][sS]) || \
!empty(BUILTIN_LIB_FOUND.tinfo:M[yY][eE][sS])
@@ -56,7 +57,9 @@ MAKEVARS+= USE_BUILTIN.termcap
# (8) If libtermlib exists by itself, then it's "termlib".
#
.if empty(H_TERM:M__nonexistent__) && empty(H_TERM:M${LOCALBASE}/*)
-. if !empty(BUILTIN_LIB_FOUND.tinfo:M[yY][eE][sS])
+. if !empty(BUILTIN_LIB_FOUND.terminfo:M[yY][eE][sS])
+BUILTIN_LIBNAME.termcap= terminfo
+. elif !empty(BUILTIN_LIB_FOUND.tinfo:M[yY][eE][sS])
BUILTIN_LIBNAME.termcap= tinfo
. elif !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
BUILTIN_LIBNAME.termcap= curses