Include appropriate CFLAGS to find X headers, needed to build libdrm.

diff --git a/configure.ac b/configure.ac
index 688a4ec..8655d97 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,10 +27,14 @@ AM_CONFIG_HEADER([libdrm/config.h])
 
 AC_PROG_LIBTOOL
 AC_PROG_CC
+AC_PATH_X
 
 AC_HEADER_STDC
 
 pkgconfigdir=${libdir}/pkgconfig
 AC_SUBST(pkgconfigdir)
 
+X11_CFLAGS=-I${x_includes}
+AC_SUBST(X11_CFLAGS)
+
 AC_OUTPUT([Makefile libdrm/Makefile shared-core/Makefile libdrm.pc])

diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
index db8778f..e9aef7a 100644 (file)
--- a/libdrm/Makefile.am
+++ b/libdrm/Makefile.am
@@ -22,7 +22,7 @@ libdrm_la_LTLIBRARIES = libdrm.la
 libdrm_ladir = $(libdir)
 libdrm_la_LDFLAGS = -version-number 1:0:0 -no-undefined
 
-AM_CFLAGS = -I$(top_srcdir)/shared-core
+AM_CFLAGS = -I$(top_srcdir)/shared-core $(X11_CFLAGS)
 libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
 
 libdrmincludedir = ${includedir}