fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nouveau: rename var name for nouveau_vieux to avoid conflict with nouveau

Browse source 
We want to require different versions for nouveau and nouveau_vieux.
autoconf will only check for NOUVEAU once if both drivers are enabled,
meaning both version checks don't get executed. Rename the nouveau_vieux
one to NVVIEUX to avoid the issue.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Tested-by: Alexandre Courbot <acourbot@nvidia.com>
Tested-by: Martin Peres <martin.peres@free.fr>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Ilia Mirkin 2015-07-01 03:47:41 -04:00
parent f045b8b2ff
commit 8276ba260e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1421,7 +1421,7 @@ if test -n "$with_dri_drivers"; then
;;
xnouveau)
HAVE_NOUVEAU_DRI=yes;
PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NVVIEUX_REQUIRED])
PKG_CHECK_MODULES([NVVIEUX], [libdrm_nouveau >= $LIBDRM_NVVIEUX_REQUIRED])
;;
xradeon)
HAVE_RADEON_DRI=yes;

4
src/mesa/drivers/dri/nouveau/Makefile.am
View file

@ -38,8 +38,8 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
$(DEFINES) \
$(VISIBILITY_CFLAGS) \
$(NOUVEAU_CFLAGS)
$(NVVIEUX_CFLAGS)
noinst_LTLIBRARIES = libnouveau_dri.la
libnouveau_dri_la_SOURCES = $(NOUVEAU_C_FILES)
libnouveau_dri_la_LIBADD = $(NOUVEAU_LIBS)
libnouveau_dri_la_LIBADD = $(NVVIEUX_LIBS)