From a0c002f2eaca9ecb8d0b50d3e440a7d66fb77326 Mon Sep 17 00:00:00 2001 From: Matthias Hopf Date: Thu, 9 Mar 2006 14:22:47 +0000 Subject: [PATCH] Do Xorg configure checks for Xgl only as well Remove creation of exa/Makefile (broken ATM). --- ChangeLog | 5 +++++ configure.ac | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e54e2494d..9bcaa4548 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-09 Matthias Hopf + + * configure.ac: Do Xorg configure checks for Xgl only as well + Remove creation of exa/Makefile (broken ATM). + 2006-03-09 David Reveman * hw/xgl/xglscreen.c (xglScreenInit): Use xglScreenInfo.widthMm diff --git a/configure.ac b/configure.ac index 524f806aa..2b10dbb12 100644 --- a/configure.ac +++ b/configure.ac @@ -1006,7 +1006,7 @@ xorg_bus_ppcpci=no xorg_bus_sparcpci=no xorg_bus_sparc=no -if test "x$XORG" = xyes; then +if test "x$XORG" = xyes -o "x$XGL" = xyes; then XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" @@ -1571,7 +1571,6 @@ xkb/Makefile Xext/Makefile Xi/Makefile xfixes/Makefile -exa/Makefile hw/Makefile hw/xfree86/Makefile hw/xfree86/common/Makefile