summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authortron <tron>2002-11-19 09:19:36 +0000
committertron <tron>2002-11-19 09:19:36 +0000
commit9456457a4a45d47fcdc2a6d44c0c85f7d5820933 (patch)
tree11d434421adfe827896d11b9927c5dbb35e5ebcf /graphics
parent2bda23f1393093138bc05ff2a2e7b30a44a88a93 (diff)
downloadpkgsrc-9456457a4a45d47fcdc2a6d44c0c85f7d5820933.tar.gz
Don't try to run "glxinfo" outside a X11 session which would produce lots
of error message.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/MesaLib/buildlink2.mk4
-rw-r--r--graphics/glu/buildlink2.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/MesaLib/buildlink2.mk b/graphics/MesaLib/buildlink2.mk
index 713f26e0e26..a8956eb506e 100644
--- a/graphics/MesaLib/buildlink2.mk
+++ b/graphics/MesaLib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/11/18 07:49:25 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2002/11/19 09:19:36 tron Exp $
.if !defined(MESALIB_BUILDLINK2_MK)
MESALIB_BUILDLINK2_MK= # defined
@@ -34,7 +34,7 @@ _NEED_MESALIB= YES
# BUILDLINK_DEPENDS.MesaLib to see if we need to install the pkgsrc
# Mesa or if the built-in one is sufficient.
#
-. if exists(${X11BASE}/bin/glxinfo)
+. if exists(${X11BASE}/bin/glxinfo) && defined(DISPLAY)
_MESALIB_VERSION!= \
${X11BASE}/bin/glxinfo | \
${SED} -n "/OpenGL version string/s/.*Mesa *//p"
diff --git a/graphics/glu/buildlink2.mk b/graphics/glu/buildlink2.mk
index 3fb817cb42a..58826b0bf5c 100644
--- a/graphics/glu/buildlink2.mk
+++ b/graphics/glu/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/11/18 07:49:25 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2002/11/19 09:19:37 tron Exp $
.if !defined(GLU_BUILDLINK2_MK)
GLU_BUILDLINK2_MK= # defined
@@ -34,7 +34,7 @@ _NEED_GLU= YES
# BUILDLINK_DEPENDS.glu to see if we need to install the pkgsrc Mesa/GLU
# or if the built-in one is sufficient.
#
-. if exists(${X11BASE}/bin/glxinfo)
+. if exists(${X11BASE}/bin/glxinfo) && defined(DISPLAY)
_GLU_VERSION!= \
${X11BASE}/bin/glxinfo | \
${SED} -n "/OpenGL version string/s/.*Mesa *//p"