From 523ab9e821b2c97afbcdde252d76a33a887f8908 Mon Sep 17 00:00:00 2001 From: skrll Date: Sun, 26 Aug 2001 11:36:02 +0000 Subject: Pull across Mesa detetecion fixes from KDE 2.1. This should hopefully fix the build problems with XF4. Build tested with XF3. --- x11/kdebase/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'x11') diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index 5bd5bb83f7e..45d57cbbb0e 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2001/04/02 20:06:15 wiz Exp $ +# $NetBSD: Makefile,v 1.81 2001/08/26 11:36:02 skrll Exp $ # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp DISTNAME= kdebase-1.1.2 @@ -52,6 +52,14 @@ KDE_DIRS= share/doc/kde/HTML/cs share/doc/kde/HTML/da \ .include "../../mk/bsd.prefs.mk" +.if ${HAVE_BUILTIN_MESA} == "NO" +EVAL_PREFIX+= MESABASE=Mesa +.else +MESABASE= ${X11BASE} +.endif + +CONFIGURE_ENV+= GL_INCLUDE="${MESABASE}/include" + .if ${OPSYS} == "SunOS" PLIST_INIT= ${PKGDIR}/PLIST-${OPSYS} .else -- cgit v1.2.3