summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2015-07-01 03:47:41 -0400
committerIlia Mirkin <imirkin@alum.mit.edu>2015-07-01 10:45:42 -0400
commit8276ba260e5500664b8d8748f3224f73ef221887 (patch)
tree02d66acae1272be8b0cccb05884b9a8648cfe0d4 /src
parentf045b8b2ff5ac75da3e092f482fd1717571d8462 (diff)
nouveau: rename var name for nouveau_vieux to avoid conflict with nouveau
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>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/nouveau/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
index 61af95a7dbc..01e34a8e3c3 100644
--- a/src/mesa/drivers/dri/nouveau/Makefile.am
+++ b/src/mesa/drivers/dri/nouveau/Makefile.am
@@ -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)