[xserver-commit] xserver ChangeLog,3.144,3.145 configure.ac,3.63,3.64

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver
In directory pdx:/tmp/cvs-serv9886

Modified Files:
	ChangeLog configure.ac 
Log Message:
configure.ac: I'm trying to unbreak the build; whether I manage to do so or not
              this time is anyone's guess.
include/{regionstr,extnsionst}.h: Drag in a couple of minor changes from XFree86
                                  (add some macros and structs).


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.144
retrieving revision 3.145
diff -u -d -r3.144 -r3.145
--- a/ChangeLog	8 Mar 2004 22:57:51 -0000	3.144
+++ b/ChangeLog	9 Mar 2004 12:41:17 -0000	3.145
@@ -1,3 +1,11 @@
+2004-03-09  Daniel Stone  <daniel@freedesktop.org>
+	* include/regionstr.h:
+	* include/extnsionst.h:
+	Add a couple of small GC vector/et al elements from XFree86.
+
+	* configure.ac:
+	Fix the build, really. I think.
+
 2004-03-08  Daniel Stone  <daniel@freedesktop.org>
 	* hw/xizzle:
 	Move this in to actually be a first-class citizen.

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.63
retrieving revision 3.64
diff -u -d -r3.63 -r3.64
--- a/configure.ac	9 Mar 2004 01:25:56 -0000	3.63
+++ b/configure.ac	9 Mar 2004 12:41:18 -0000	3.64
@@ -94,6 +94,7 @@
 AC_ARG_ENABLE(kdriveserver,  [  --disable-kdriveserver ],[KDRIVESERVER=$enableval],[KDRIVESERVER=yes])
 AC_ARG_ENABLE(xnestserver,   [  --enable-xnestserver ],[XNESTSERVER=$enableval],[XNESTSERVER=no])
 AC_ARG_ENABLE(xwinserver,    [  --enable-xwinserver ],[XWINSERVER=$enableval],[XWINSERVER=no])
+AC_ARG_ENABLE(xsdlserver,    [  --enable-xsdlserver ],[XSDLSERVER=$enableval],[XSDLSERVER=no])
 AC_ARG_ENABLE(xizzleserver,  [  --enable-xizzleserver ],[XIZZLESERVER=$enableval],[XIZZLESERVER=no])
 AC_ARG_ENABLE(xtrap,         [  --enable-xtrap ],[XTRAP=$enableval],[XTRAP=no])
 AC_ARG_ENABLE(builtinrgb,    [  --disable-builtinrgb ],[USE_RGB_BUILTIN=$enableval],[USE_RGB_BUILTIN=yes])
@@ -346,18 +347,24 @@
 
 KDRIVE_LIBS=
 KDRIVE_INCS=
+KDRIVE_PURE_LIBS=
+KDRIVE_PURE_INCS=
 if test "$KDRIVESERVER" = yes; then
 	KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
 	KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
 	KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
 	KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
 	
-	KDRIVE_LIBS="$DIX_LIB $OS_LIB $KDRIVE_LIB $KDRIVE_OS_LIB \
-	             $EXTENSION_LIBS $FB_LIB $MI_LIB \
-		     $EXTENSION_LIBS $DAMAGE_LIB $SHADOW_LIB $XPSTUBS_LIB"
-	KDRIVE_INCS="$KDRIVE_INC $KDRIVE_OS_INC $DAMAGE_INC $SHADOW_INC \
-		     $EXTENSION_INCS $FB_INC $MI_INC"
+	KDRIVE_PURE_LIBS="$DIX_LIB $OS_LIB $KDRIVE_LIB $KDRIVE_OS_LIB \
+	                  $FB_LIB $MI_LIB $EXTENSION_LIBS $DAMAGE_LIB \
+			  $SHADOW_LIB $XPSTUBS_LIB"
+	KDRIVE_PURE_INCS="$KDRIVE_INC $DAMAGE_INC $SHADOW_INC $EXTENSION_INCS \
+	                  $FB_INC $MI_INC"
+	KDRIVE_LIBS="$KDRIVE_PURE_LIBS $KDRIVE_OS_LIB"
+	KDRIVE_INCS="$KDRIVE_PURE_INCS"
 fi
+AC_SUBST([KDRIVE_PURE_LIBS])
+AC_SUBST([KDRIVE_PURE_INCS])
 AC_SUBST([KDRIVE_LIBS])
 AC_SUBST([KDRIVE_INCS])
 
@@ -391,6 +398,18 @@
 AC_SUBST([XWIN_LIBS])
 AC_SUBST([XWIN_INCS])
 
+XSDL_LIBS=
+XSDL_INCS=
+XSDL_DIRS=
+if test "$XSDLSERVER" = yes; then
+	XSDL_LIBS=`sdl-config --libs`
+	XSDL_INCS=`sdl-config --cflags`
+	XSDL_DIRS=sdl
+fi
+AC_SUBST([XSDL_LIBS])
+AC_SUBST([XSDL_INCS])
+AC_SUBST([XSDL_DIRS])
+
 XIZZLE_LIBS=
 XIZZLE_INCS=
 XIZZLE_OS=
@@ -517,6 +536,7 @@
 hw/kdrive/ati/Makefile
 hw/kdrive/mach64/Makefile
 hw/kdrive/mga/Makefile
+hw/kdrive/sdl/Makefile
 hw/kdrive/smi/Makefile
 hw/kdrive/nvidia/Makefile
 hw/kdrive/r128/Makefile