Module Name: src
Committed By: mrg
Date: Sun Mar 10 11:02:46 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
export HAVE_MESA_VER for use in makefiles and set lists.
To generate a diff of this commit:
cvs rdiff -u -r1.1110 -r1.1111 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1110 src/share/mk/bsd.own.mk:1.1111
--- src/share/mk/bsd.own.mk:1.1110 Sun Mar 10 02:29:52 2019
+++ src/share/mk/bsd.own.mk Sun Mar 10 11:02:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1110 2019/03/10 02:29:52 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1111 2019/03/10 11:02:46 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1436,7 +1436,7 @@ X11SRCDIRMIT?= ${X11SRCDIR}/external/mi
FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
Xdmcp Xevie Xext Xfixes Xfont Xfont2 Xft Xi Xinerama Xmu Xpresent Xpm \
Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
- epoxy fontenc xkbfile xkbui Xaw pciaccess xcb xshmfence \
+ epoxy fontenc vdpau xkbfile xkbui Xaw pciaccess xcb xshmfence \
pthread-stubs
X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib${_lib}/dist
.endfor
@@ -1467,7 +1467,12 @@ HAVE_XORG_SERVER_VER?=120
.endif
# MesaLib.old and MesaLib7 go together, and MesaLib is alone.
+HAVE_MESA_VER?= 10
+.if ${HAVE_MESA_VER} == "10"
EXTERNAL_MESALIB_DIR?= MesaLib.old
+.else
+EXTERNAL_MESALIB_DIR?= MesaLib
+.endif
.if ${HAVE_XORG_SERVER_VER} == "120"
XORG_SERVER_SUBDIR?=xorg-server
