diff options
| author | tron <tron@pkgsrc.org> | 2001-07-10 16:37:13 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-07-10 16:37:13 +0000 |
| commit | 19cbb6783009fdf7e4b315f0609707ee7ef32529 (patch) | |
| tree | e80d3a0f49cee0e632524dcf897e976f528c542c /mk | |
| parent | 858eacaa91552857ad1a004c2539412dc18d9cab (diff) | |
| download | pkgsrc-19cbb6783009fdf7e4b315f0609707ee7ef32529.tar.gz | |
Check if "${X11BASE}/lib/X11/config/X11.tmpl" exists before searching
with "grep" through it in Mesa library handling.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 954a8e5f460..9e5d62b8334 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.52 2001/07/10 15:07:35 tron Exp $ +# $NetBSD: bsd.prefs.mk,v 1.53 2001/07/10 16:37:13 tron Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -158,12 +158,14 @@ XAW_TYPE?= standard # XFree86 starting with 4.1.0 contains now a libGLU, so also check for it. .if (defined(CHECK_MESA) || defined(USE_MESA)) X11BASE?= /usr/X11R6 -.if exists(${X11BASE}/include/GL/glx.h) +.if exists(${X11BASE}/include/GL/glx.h) && \ + exists(${X11BASE}/lib/X11/config/X11.tmpl) __BUILTIN_MESA!= ${EGREP} -c BuildGLXLibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} .else __BUILTIN_MESA= 0 .endif -.if exists(${X11BASE}/include/GL/glu.h) +.if exists(${X11BASE}/include/GL/glu.h) && \ + exists(${X11BASE}/lib/X11/config/X11.tmpl) __BUILTIN_GLU!= egrep -c BuildGLULibrary ${X11BASE}/lib/X11/config/X11.tmpl || true .else __BUILTIN_GLU= 0 |