Mesa (17.1): st/mesa: automake: honour the vdpau header install location

[Emil Velikov]

Module: Mesa
Branch: 17.1
Commit: 8aa9aa6a5f86891c106bcc95d88377af1bfa0406
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8aa9aa6a5f86891c106bcc95d88377af1bfa0406

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Sun Apr 16 15:46:28 2017 +0100

st/mesa: automake: honour the vdpau header install location

If VDPAU is installed in the non-default location, we'll fail to find
the headers and error at build time.

../../src/gallium/include/state_tracker/vdpau_dmabuf.h:37:25: fatal error: vdpau/vdpau.h: No such file or directory
 #include <vdpau/vdpau.h>
                         ^

Fixes: faba96bc60b ("st/vdpau: add new interop interface")
Cc: Christian König <christian.koenig at amd.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
(cherry picked from commit 51c0c213b7fa53b249e9fcb9004a3ba1076fe773)

---

 src/mesa/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 9710c7f094..53f311d2a9 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -96,6 +96,7 @@ endif
 
 AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
 AM_CFLAGS = \
+	$(VDPAU_CFLAGS) \
 	$(LLVM_CFLAGS) \
 	$(VISIBILITY_CFLAGS) \
 	$(MSVC2013_COMPAT_CFLAGS)