xserver: Branch 'glucose-2'

[Alan Hourihane]

 configure.ac           |    8 ++------
 glucose/Makefile.am    |    4 +---
 hw/xfree86/Makefile.am |    2 +-
 xgl/Makefile.am        |    4 +---
 4 files changed, 5 insertions(+), 13 deletions(-)

New commits:
commit 10853f9104a8a202c20b80697abf03723c973e88
Author: Alan Hourihane <alanh at localhost.(none)>
Date:   Tue Aug 12 21:40:53 2008 +0100

    Fix build

diff --git a/configure.ac b/configure.ac
index 8b921da..f972608 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1233,14 +1233,10 @@ fi
 AC_MSG_RESULT([$XGL])
 AM_CONDITIONAL(XGL, [test "x$XGL" = xyes])
 
-if test "x$XGL" = xyes -o "x$GLUCOSE" = xyes; then
-	XGL_LIBS="$FB_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $CWRAP_LIB"
-	AC_SUBST([XGL_LIBS])
-fi
-
 if test "x$XGL" = xyes; then
-	XGL_LIBS="$FB_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB"
+	XGL_LIBS="$FB_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $CWRAP_LIB"
 	XGL_SYS_LIBS="$XGLMODULES_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
+	AC_SUBST([XGL_LIBS])
 	AC_SUBST([XGL_SYS_LIBS])
 	AC_DEFINE(XGL_MODULAR, 1, [Use loadable XGL modules])
 	AC_DEFINE(XGLServer, 1, [Building XGL server])
diff --git a/glucose/Makefile.am b/glucose/Makefile.am
index 943a3c7..64fdd7a 100644
--- a/glucose/Makefile.am
+++ b/glucose/Makefile.am
@@ -1,9 +1,7 @@
 noinst_LTLIBRARIES = libglucose.la
 
 INCLUDES = -I at MESA_SOURCE@/include \
-           -I$(top_srcdir)/GL/mesa/glapi \
-           -I$(top_srcdir)/GL/glx \
-           -I$(top_srcdir)/GL/include \
+           -I$(top_srcdir)/glx \
            -I$(top_srcdir)/xgl \
            -I$(top_srcdir)/hw/xfree86/os-support \
            -I$(top_srcdir)/hw/xfree86/os-support/bus \
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 8b6c2cc..3585e4d 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -26,7 +26,7 @@ SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser \
 DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
                parser ramdac shadowfb vbe vgahw xaa \
                xf8_16bpp loader dixmods dri dri2 exa modes \
-	       utils doc
+	       utils doc glucose
 
 bin_PROGRAMS = Xorg
 
diff --git a/xgl/Makefile.am b/xgl/Makefile.am
index b386ce0..4eb6579 100644
--- a/xgl/Makefile.am
+++ b/xgl/Makefile.am
@@ -1,9 +1,7 @@
 noinst_LTLIBRARIES = libxgl.la
 
 INCLUDES = -I at MESA_SOURCE@/include \
-           -I$(top_srcdir)/GL/mesa/glapi \
-           -I$(top_srcdir)/GL/glx \
-           -I$(top_srcdir)/GL/include \
+           -I$(top_srcdir)/glx \
            -I$(top_srcdir)/hw/xfree86/os-support \
            -I$(top_srcdir)/hw/xfree86/os-support/bus \
            -I$(top_srcdir)/hw/xfree86/common