summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-07-15 22:51:05 +0000
committerKevin E Martin <kem@kem.org>2005-07-15 22:51:05 +0000
commita407fa373bb72f29050e3f027042011075b3bdf0 (patch)
tree002e232489505a0ca8e4b3e7b2862b748c21dfa3 /configure.ac
parenteb6fa0dc15516a0a436090efc6d85f22baeec015 (diff)
Move drm up to os-support since the files are shared by multiple platforms.
Fix the dri and drm build. Fix server-side DMX extension build. Make xf4bpp use the correct version of mfbline.c for mfbseg.c. Add #ifndef _HEADERNAME_H_/#define _HEADERNAME_H_/.../#endif to the headers.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index dcbcfbf4b..1663ac064 100644
--- a/configure.ac
+++ b/configure.ac
@@ -390,10 +390,11 @@ AC_SUBST([MESA_SOURCE])
AM_CONDITIONAL(DRI, test x$DRI = xyes)
if test "$DRI" = yes; then
- AC_DEFINE(XORGDRI,1,[Build DRI extension])
- AC_DEFINE(_XORGDRI_SERVER_,1,[XORGDRI internal define])
+ AC_DEFINE(XF86DRI,1,[Build DRI extension])
PKG_CHECK_MODULES([DRIPROTO], [xf86driproto])
AC_SUBST(DRIPROTO_CFLAGS)
+ PKG_CHECK_MODULES([LIBDRM], [libdrm])
+ AC_SUBST(LIBDRM_CFLAGS)
fi
AC_DEFINE(XINPUT,1,[Support X Input extension])
EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/Xi/libXi.la'
@@ -803,9 +804,9 @@ hw/xfree86/int10/Makefile
hw/xfree86/loader/Makefile
hw/xfree86/os-support/Makefile
hw/xfree86/os-support/bus/Makefile
+hw/xfree86/os-support/drm/Makefile
hw/xfree86/os-support/misc/Makefile
hw/xfree86/os-support/linux/Makefile
-hw/xfree86/os-support/linux/drm/Makefile
hw/xfree86/os-support/solaris/Makefile
hw/xfree86/parser/Makefile
hw/xfree86/rac/Makefile