[Mesa-dev] [PATCH] nouveau: rename var name for nouveau_vieux to avoid conflict with nouveau

[Alexandre Courbot]

On 07/01/2015 04:49 PM, Ilia Mirkin wrote:
> 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.

Tested-by: Alexandre Courbot <acourbot at nvidia.com>

Confirmed that configure properly fails on libdrm < 2.4.62 if both the 
DRI and Gallium drivers are compiled.

>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>   configure.ac                             | 2 +-
>   src/mesa/drivers/dri/nouveau/Makefile.am | 4 ++--
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index af61aa2..60d180d 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -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;
> diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
> index 61af95a..01e34a8 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)
>