[PATCH 00/54] extmod, again (and XAA)

[Alan Coopersmith]

On 07/ 9/12 06:02 PM, Daniel Stone wrote:
> Hi,
> This should hopefully be the very totally final version of the extmod
> patches.  These have all had to be rebased, and some have had to have
> minor tweaks, so I've sent them out again.
> 
> The list of changes are below; obviously all the new patches will need
> review, but the changes to the rest are minor enough that they should
> be OK with the old tags.
> 
> This tree is also available from:
>     git://people.freedesktop.org/~daniels/xserver master

After pulling this into a local branch, I needed one small change to
build successfully, since my tree is currently configured with
--disable-dri --disable-dri2:


diff --git a/test/Makefile.am b/test/Makefile.am
index 7a24d20..8d086b5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -54,12 +54,19 @@ libxservertest_la_LIBADD += \
             $(top_builddir)/hw/xfree86/modes/libxf86modes.la \
             $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
             $(top_builddir)/hw/xfree86/ddc/libddc.la \
-            $(top_builddir)/hw/xfree86/dri/libdri.la \
-            $(top_builddir)/hw/xfree86/dri2/libdri2.la \
             $(top_builddir)/hw/xfree86/i2c/libi2c.la \
             $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
             @XORG_LIBS@

+if DRI
+libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri/libdri.la
+endif
+
+if DRI2
+libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri2/libdri2.la
+endif
+
+
 else
 nodist_libxservertest_la_SOURCES = \
             ddxstubs.c \



Though those should probably be split amongst the commits for:
    Move DRI1 from external module to built-in
    Move DRI2 from external module to built-in
(and I didn't check that I can build with DRI, since I currently don't have a
 buildable Mesa tree due to upstream breakage there I've not gotten around to
 tracking down).

-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc