From: Robert Foss <robert.f...@collabora.com>
Replace the automake flag HAVE_XXX for VC4/NOUVEAU with HAVE_LIBDRM_XXX in
order for the flags to be more descriptive and also follow the same convention
as HAVE_LIBDRM_INTEL.
---
configure.ac | 8 ++++----
lib/Makefile.am | 2 +-
tests/Makefile.am | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 49903e4..a6210ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,9 +174,9 @@ if test "x$NOUVEAU" = xauto; then
fi
if test "x$NOUVEAU" = xyes; then
PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33])
- AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau support])
+ AC_DEFINE(HAVE_LIBDRM_NOUVEAU, 1, [Have nouveau support])
fi
-AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes])
+AM_CONDITIONAL(HAVE_LIBDRM_NOUVEAU, [test "x$NOUVEAU" = xyes])
AC_ARG_ENABLE(vc4, AS_HELP_STRING([--disable-vc4],
[Enable building of vc4 tests (default: auto)]),
@@ -186,9 +186,9 @@ if test "x$VC4" = xauto; then
fi
if test "x$VC4" = xyes; then
PKG_CHECK_MODULES(DRM_VC4, [libdrm_vc4])
- AC_DEFINE(HAVE_VC4, 1, [Have vc4 support])
+ AC_DEFINE(HAVE_LIBDRM_VC4, 1, [Have vc4 support])
fi
-AM_CONDITIONAL(HAVE_VC4, [test "x$VC4" = xyes])
+AM_CONDITIONAL(HAVE_LIBDRM_VC4, [test "x$VC4" = xyes])
# Define a configure option for the shader debugger
AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger],
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d2f2e16..d2ae98d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -8,7 +8,7 @@ include Makefile.sources
noinst_LTLIBRARIES = libintel_tools.la
noinst_HEADERS = check-ndebug.h
-if HAVE_VC4
+if HAVE_LIBDRM_VC4
libintel_tools_la_SOURCES += \
igt_vc4.c \
igt_vc4.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c2c2025..737afbe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,10 +1,10 @@
include Makefile.sources
-if HAVE_NOUVEAU
+if HAVE_LIBDRM_NOUVEAU
TESTS_progs_M += $(NOUVEAU_TESTS_M)
endif
-if HAVE_VC4
+if HAVE_LIBDRM_VC4
TESTS_progs_M += $(VC4_TESTS_M)
endif
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
