[xserver-commit] xserver ChangeLog,3.136,3.137 configure.ac,3.59,3.60

[Jaymz Julian]

Committed by: jaymz

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

Modified Files:
	ChangeLog configure.ac 
Log Message:

sdl x server so that we can x-on-x the fb stuff for ease of debugging.  if
anyone uses this in production, a big scary monster will eat them.  hrm, 
perhaps i should make it have a --i-know-what-i'm-doing param that it
doens't start without, heh



Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.136
retrieving revision 3.137
diff -u -d -r3.136 -r3.137
--- a/ChangeLog	26 Feb 2004 19:26:32 -0000	3.136
+++ b/ChangeLog	28 Feb 2004 09:47:55 -0000	3.137
@@ -1,3 +1,12 @@
+2004-02-28  Jaymz Julian  <jaymz@artificial-stupidity.net>
+	* configure.ac:
+	* hw/kdrive/Makefile.am:
+	* hw/kdrive/sdl/Makefile.am:
+	* hw/kdrive/sdl/sdl.c:
+	A simple SDL based X server for running X on X.  Not for
+	production use, of course. --enable-xsdlserver in ./configure
+	should make it happen.
+
 2004-02-26  Keith Packard  <keithp@keithp.com>
 
 	* miext/damage/damage.c: (damageDamageRegion):

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.59
retrieving revision 3.60
diff -u -d -r3.59 -r3.60
--- a/configure.ac	15 Feb 2004 14:33:51 -0000	3.59
+++ b/configure.ac	28 Feb 2004 09:47:55 -0000	3.60
@@ -100,6 +100,8 @@
               [XNESTSERVER=$enableval],[XNESTSERVER=yes])
 AC_ARG_ENABLE(xwinserver,    AS_HELP_STRING([--enable-xwinserver],[]),
               [XWINSERVER=$enableval],[XWINSERVER=no])
+AC_ARG_ENABLE(xsdlserver,    AS_HELP_STRING([--enable-xsdlserver],[Enable the Xsdl server]),
+              [XSDLSERVER=$enableval],[XSDLSERVER=no])
 AC_ARG_ENABLE(xtrap,         AS_HELP_STRING([--enable-xtrap],[]),
               [XTRAP=$enableval],[XTRAP=no])
 AC_ARG_ENABLE(builtinrgb,    AS_HELP_STRING([--disable-builtinrgb],[]),
@@ -332,6 +334,8 @@
 
 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'
@@ -343,9 +347,16 @@
 		     $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 \
+	             $EXTENSION_LIBS $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"
 fi
 AC_SUBST([KDRIVE_LIBS])
 AC_SUBST([KDRIVE_INCS])
+AC_SUBST([KDRIVE_PURE_INCS])
+AC_SUBST([KDRIVE_PURE_LIBS])
 
 XNEST_LIBS=
 XNEST_INCS=
@@ -377,6 +388,19 @@
 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])
+
 AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS})
 
 XSERVER_CFLAGS="$XSERVER_CFLAGS "'-I${top_srcdir}/include'
@@ -443,6 +467,7 @@
 hw/kdrive/smi/Makefile
 hw/kdrive/nvidia/Makefile
 hw/kdrive/r128/Makefile
+hw/kdrive/sdl/Makefile
 hw/kdrive/chips/Makefile
 hw/xnest/Makefile
 hw/xwin/Makefile