diff options
author | tron <tron@pkgsrc.org> | 2002-09-01 11:49:42 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2002-09-01 11:49:42 +0000 |
commit | dc618de551927cfea6ad0a00bb04e2612d207e0a (patch) | |
tree | 6a9afe0536ba77ce9ef782e0b5e9c4d43c3abfa5 /graphics/glu | |
parent | ff29df199c15b77aa69076d36e92fb52ae9fe907 (diff) | |
download | pkgsrc-dc618de551927cfea6ad0a00bb04e2612d207e0a.tar.gz |
Fix problem with XFree86 checks under Solaris.
Diffstat (limited to 'graphics/glu')
-rw-r--r-- | graphics/glu/Makefile | 4 | ||||
-rw-r--r-- | graphics/glu/buildlink2.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile index d03c8f88302..05bf4edc200 100644 --- a/graphics/glu/Makefile +++ b/graphics/glu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/08/25 18:39:06 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/09/01 11:49:42 tron Exp $ PKGNAME= ${DISTNAME:C/MesaLib/glu/} WRKSRC= ${WRKDIR}/${DISTNAME:C/Lib//} @@ -16,7 +16,7 @@ USE_X11BASE= yes .include "../../mk/bsd.prefs.mk" # Check if we got libGLU distributed with XFree86 4.x. -.if exists(${X11BASE}/include/GL/glu.h) +.if (${OPSYS} != SunOS) && exists(${X11BASE}/include/GL/glu.h) _IS_BUILTIN_GLU!= ${EGREP} -c BuildGLULibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} .else _IS_BUILTIN_GLU= 0 diff --git a/graphics/glu/buildlink2.mk b/graphics/glu/buildlink2.mk index 6ce4d584bd0..a75c51d1663 100644 --- a/graphics/glu/buildlink2.mk +++ b/graphics/glu/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:07 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2002/09/01 11:49:42 tron Exp $ .if !defined(GLU_BUILDLINK2_MK) GLU_BUILDLINK2_MK= # defined @@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.glu?= ../../graphics/glu # depend on the glu package. # _REQUIRE_BUILTIN_GLU?= NO -.if exists(${X11BASE}/include/GL/glu.h) +.if (${OPSYS} != SunOS) && exists(${X11BASE}/include/GL/glu.h) _IS_BUILTIN_GLU!= ${EGREP} -c BuildGLULibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} .else _IS_BUILTIN_GLU= 0 |