projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 16f6d43)
dri/swrast: automake: add LIBDRM_CFLAGS
authorEmil Velikov <emil.l.velikov@gmail.com>
Wed, 22 Jul 2015 15:22:44 +0000 (16:22 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 22 Jul 2015 15:33:11 +0000 (16:33 +0100)
With the follow up commit we'll remove the __NOT_HAVE_DRM_H macro. As
requested by Ian HAVE_LIBDRM will be used instead, which will lead to
swrast including drm.h when libdrm package is available, even though we
don't need/make use of the header.

As the define is added after the AM_CFLAGS we cannnot use -UHAVE_LIBDRM,
but instead let's just add LIBDRM_CFLAGS. The latter of which will
expand to NULL when the libdrm package is not around.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
src/mesa/drivers/dri/swrast/Makefile.am patch | blob | history

diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am
index bfc3c10e334e6629102f37be8331e3ae4ea9b19e..9c86d504477838d91f705a350c59c5920a7c210f 100644 (file)
--- a/src/mesa/drivers/dri/swrast/Makefile.am
+++ b/src/mesa/drivers/dri/swrast/Makefile.am
@@ -33,6 +33,7 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
        -I$(top_builddir)/src/mesa/drivers/dri/common \
+       $(LIBDRM_CFLAGS) \
        $(DEFINES) \
        $(VISIBILITY_CFLAGS)