From: robert.foss@collabora.com
To: daniel.vetter@ffwll.ch, daniel.stone@collabora.com,
marius.c.vlad@intel.com, tomeu.vizoso@collabora.com,
emil.velikov@collabora.com, chris@chris-wilson.co.uk
Cc: intel-gfx@lists.freedesktop.org
Subject: [RFC i-g-t 2/7] configure.ac: Harmonize HAVE_XXX flag for all drm platforms to HAVE_LIBDRM_XXX.
Date: Wed, 25 May 2016 14:18:51 -0400 [thread overview]
Message-ID: <1464200336-15671-3-git-send-email-robert.foss@collabora.com> (raw)
In-Reply-To: <1464200336-15671-1-git-send-email-robert.foss@collabora.com>
From: Robert Foss <robert.foss@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 48d81c5..e27698b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,9 +171,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)]),
@@ -183,9 +183,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
next prev parent reply other threads:[~2016-05-25 18:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-25 18:18 [RFC i-g-t 0/7] Remove compile time depencencies on libdrm_intel robert.foss
2016-05-25 18:18 ` [RFC i-g-t 1/7] configure.ac: Test for libdrm_intel and build for it if present robert.foss
2016-05-25 21:50 ` Rémi Cardona
2016-05-25 18:18 ` robert.foss [this message]
2016-05-25 18:18 ` [RFC i-g-t 3/7] benchmarks/Makefile: Don't build benchmarks that depend on libdrm_intel robert.foss
2016-05-25 18:18 ` [RFC i-g-t 4/7] tools/Makefile: Don't build tools " robert.foss
2016-05-25 18:18 ` [RFC i-g-t 5/7] tools/Makefile: Format whitespace robert.foss
2016-05-25 18:18 ` [RFC i-g-t 6/7] demos/Makefile: Don't build tools that depend on libdrm_intel robert.foss
2016-05-25 18:18 ` [RFC i-g-t 7/7] lib/stubs: Add stubs for intel_bufmgr robert.foss
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464200336-15671-3-git-send-email-robert.foss@collabora.com \
--to=robert.foss@collabora.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel.stone@collabora.com \
--cc=daniel.vetter@ffwll.ch \
--cc=emil.velikov@collabora.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=marius.c.vlad@intel.com \
--cc=tomeu.vizoso@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).