patch 105_libdrm_headers_check.patch

diff --git a/configure.ac b/configure.ac
index 48125fe..7d317b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,12 @@ PKG_CHECK_MODULES([XEXT], [xext])
 PKG_CHECK_MODULES([Xfixes], [xfixes])
 PKG_CHECK_MODULES([XDAMAGE], [xdamage])
 PKG_CHECK_MODULES([DRM], [libdrm])
-#PKG_CHECK_MODULES([libva_la], [libdrm])
+PKG_CHECK_MODULES(LIBDRM_DEPS, [libdrm])
+
+# We only need the headers, we don't link against the DRM libraries
+LIBVA_CFLAGS="$LIBDRM_DEPS_CFLAGS"
+AC_SUBST(LIBVA_CFLAGS)
+AC_SUBST(LIBVA_LIBS)
 
 pkgconfigdir=${libdir}/pkgconfig
 AC_SUBST(pkgconfigdir)

diff --git a/src/Makefile.am b/src/Makefile.am
index cb0ac94..5c5a1b2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,10 +20,13 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+INCLUDES = \
+       $(LIBVA_CFLAGS)
+
 libva_la_LTLIBRARIES = libva.la
 libva_ladir = $(libdir)
 libva_la_LDFLAGS = -version-number 0:30:0 -no-undefined
-libva_la_LIBADD = -ldl -lX11 -lXext -lXfixes -lXdamage -lXv -lXrandr X11/libva_X11.la
+libva_la_LIBADD = $(LIBVA_LIBS) -ldl -lX11 -lXext -lXfixes -lXdamage -lXv -lXrandr X11/libva_X11.la
 
 SUBDIRS = X11