summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2005-08-25 02:59:21 +0000
committerEric Anholt <anholt@freebsd.org>2005-08-25 02:59:21 +0000
commit7d5130d8fb24538e555689fb8e98f767406e0a2c (patch)
tree08224cd7de0c259c71833113fd0637e5d9642c1a
parent5a52e533e1f42072b91544fdbca785ed2c9ad76b (diff)
Include appropriate CFLAGS to find X headers, needed to build libdrm.
-rw-r--r--configure.ac4
-rw-r--r--libdrm/Makefile.am2
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 688a4ec0..8655d970 100644
--- 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 db8778f1..e9aef7a3 100644
--- 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}