diff options
| author | jlam <jlam> | 2008-02-27 17:36:34 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-02-27 17:36:34 +0000 |
| commit | 587e022e575cd460e9749523e21e4a027ddb1c83 (patch) | |
| tree | e134be49d41fbe3ca68e0686455787fedc90fd73 /mk | |
| parent | 8688eb716d1eeb1594cb30f645de958574f087ed (diff) | |
| download | pkgsrc-587e022e575cd460e9749523e21e4a027ddb1c83.tar.gz | |
Teach termlib files about another possible native terminal library, tinfo.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/termlib.buildlink3.mk | 7 | ||||
| -rw-r--r-- | mk/termlib.builtin.mk | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/mk/termlib.buildlink3.mk b/mk/termlib.buildlink3.mk index bd9d8a5e073..0c97ead5bbc 100644 --- a/mk/termlib.buildlink3.mk +++ b/mk/termlib.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: termlib.buildlink3.mk,v 1.2 2008/02/27 06:10:25 jlam Exp $ +# $NetBSD: termlib.buildlink3.mk,v 1.3 2008/02/27 17:36:34 jlam Exp $ # # This Makefile fragment is meant to be included by packages that require # a basic termlib implementation. @@ -34,11 +34,12 @@ BUILD_DEFS+= TERMLIB_TYPE .if ${TERMLIB_TYPE} == "none" PKG_FAIL_REASON= "No usable terminal library found on the system." -.elif (${TERMLIB_TYPE} == "termcap") +.elif (${TERMLIB_TYPE} == "termcap") || \ + (${TERMLIB_TYPE} == "tinfo") BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntermlib} BUILDLINK_PACKAGES+= termlib BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}termlib -BUILDLINK_LIBNAME.termlib?= termcap +BUILDLINK_LIBNAME.termlib?= ${BUILTIN_LIBNAME.termlib} BUILDLINK_LDADD.termlib?= ${BUILDLINK_LIBNAME.termlib:S/^/-l/} BUILDLINK_BUILTIN_MK.termlib= ../../mk/termlib.builtin.mk .elif ${TERMLIB_TYPE} == "curses" diff --git a/mk/termlib.builtin.mk b/mk/termlib.builtin.mk index b7386eb80b2..79bb7ed90a3 100644 --- a/mk/termlib.builtin.mk +++ b/mk/termlib.builtin.mk @@ -1,8 +1,8 @@ -# $NetBSD: termlib.builtin.mk,v 1.2 2008/02/27 15:26:34 jlam Exp $ +# $NetBSD: termlib.builtin.mk,v 1.3 2008/02/27 17:36:34 jlam Exp $ BUILTIN_PKG:= termlib -BUILTIN_FIND_LIBS:= termcap curses +BUILTIN_FIND_LIBS:= termcap tinfo curses .include "buildlink3/bsd.builtin.mk" @@ -13,6 +13,7 @@ BUILTIN_FIND_LIBS:= termcap curses .if !defined(IS_BUILTIN.termlib) IS_BUILTIN.termlib= no . if !empty(BUILTIN_LIB_FOUND.termcap:M[yY][eE][sS]) || \ + !empty(BUILTIN_LIB_FOUND.tinfo:M[yY][eE][sS]) || \ !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) IS_BUILTIN.termlib= yes . endif @@ -37,6 +38,8 @@ MAKEVARS+= USE_BUILTIN.termlib # .if !empty(BUILTIN_LIB_FOUND.termcap:M[yY][eE][sS]) BUILTIN_LIBNAME.termlib= termcap +.elif !empty(BUILTIN_LIB_FOUND.tinfo:M[yY][eE][sS]) +BUILTIN_LIBNAME.termlib= tinfo .elif !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) BUILTIN_LIBNAME.termlib= curses .endif |