diff options
| -rw-r--r-- | graphics/freetype2/buildlink.mk | 6 | ||||
| -rw-r--r-- | graphics/xpm/buildlink.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/graphics/freetype2/buildlink.mk b/graphics/freetype2/buildlink.mk index 847307dd69c..8849ac95c7b 100644 --- a/graphics/freetype2/buildlink.mk +++ b/graphics/freetype2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.13 2001/11/30 17:21:55 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.14 2002/06/26 05:40:33 jlam Exp $ # # This Makefile fragment is included by packages that use freetype2. # @@ -22,13 +22,13 @@ BUILDLINK_DEPENDS.freetype2?= freetype2>=2.0.1 # Check if we got FreeType2 distributed with XFree86 4.x or if we need to # depend on the freetype2 package. # -.include "../../mk/bsd.prefs.mk" +_REQUIRE_BUILTIN_FREETYPE2?= NO .if exists(${X11BASE}/include/freetype2/freetype/freetype.h) _IS_BUILTIN_FREETYPE2!= ${EGREP} -c BuildFreetype2Library ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} .else _IS_BUILTIN_FREETYPE2= 0 .endif -.if ${_IS_BUILTIN_FREETYPE2} == "0" +.if (${_IS_BUILTIN_FREETYPE2} == "0") && (${_REQUIRE_BUILTIN_FREETYPE2} == "NO") _NEED_FREETYPE2= YES .else _NEED_FREETYPE2= NO diff --git a/graphics/xpm/buildlink.mk b/graphics/xpm/buildlink.mk index 9f9063922a6..0fbed366c5d 100644 --- a/graphics/xpm/buildlink.mk +++ b/graphics/xpm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.10 2001/07/27 13:33:31 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.11 2002/06/26 05:40:34 jlam Exp $ # # This Makefile fragment is included by packages that use xpm. # @@ -20,14 +20,14 @@ BUILDLINK_DEPENDS.xpm?= xpm-3.4k # Check if we got Xpm distributed with XFree86 4.x or if we need to # depend on the Xpm package. # -.include "../../mk/bsd.prefs.mk" +_REQUIRE_BUILTIN_XPM?= NO .if exists(${X11BASE}/include/X11/xpm.h) && \ exists(${X11BASE}/lib/X11/config/X11.tmpl) _IS_BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} .else _IS_BUILTIN_XPM= 0 .endif -.if ${_IS_BUILTIN_XPM} == "0" +.if (${_IS_BUILTIN_XPM} == "0") && (${_REQUIRE_BUILTIN_XPM} == "NO") _NEED_XPM= YES .else _NEED_XPM= NO |