xserver ChangeLog,3.224,3.225 configure.ac,3.89,3.90

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver
In directory pdx:/home/daniel/x/xserver

Modified Files:
	ChangeLog configure.ac 
Log Message:
Xizzle is now dead code; removing all traces of it from the build system.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.224
retrieving revision 3.225
diff -u -d -r3.224 -r3.225
--- ChangeLog	26 Jul 2004 23:31:30 -0000	3.224
+++ ChangeLog	28 Jul 2004 07:55:34 -0000	3.225
@@ -1,3 +1,11 @@
+2004-07-28  Daniel Stone  <daniel at freedesktop.org>
+
+	* configure.ac:
+	* hw/Makefile.am:
+	It's official - Xizzle is dead code. hw/xorg has been moved to
+	/cvs/xserver/DEAD/xorg; all traces of it have been removed from
+	xserver.
+
 2004-07-27  Phil Blundell  <pb at nexus.co.uk>
 
 	* configure.ac: Don't require xkbfile if xkb not enabled.

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.89
retrieving revision 3.90
diff -u -d -r3.89 -r3.90
--- configure.ac	26 Jul 2004 23:31:30 -0000	3.89
+++ configure.ac	28 Jul 2004 07:55:34 -0000	3.90
@@ -97,7 +97,6 @@
 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(xorgserver,    [  --enable-xorgserver ],[XORGSERVER=$enableval],[XORGSERVER=no])
 AC_ARG_ENABLE(xglserver,     [  --enable-xglserver ],[XGLSERVER=$enableval],[XGLSERVER=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])
@@ -182,15 +181,6 @@
 	XWIN_REQUIRED_MODULES="x11"
 fi
 
-AM_CONDITIONAL(XORGSERVER, [test x$XORGSERVER = xyes])
-if test "$XORGSERVER" = yes; then
-	AC_DEFINE(XORGSERVER,,[Build Xorg server])
-	AC_DEFINE(XKB,,[Build Xkb])
-	AC_DEFINE(XINPUT,,[Build XInput])
-	AC_DEFINE(XF86DDXACTIONS,,[Build Xorg ddx])
-fi
-#AC_SUBST([XKB])
-
 AM_CONDITIONAL(XGLSERVER, [test x$XGLSERVER = xyes])
 if test "$XGLSERVER" = yes; then
 	AC_DEFINE(XGLSERVER,1,[Build GL X server])
@@ -459,75 +449,6 @@
 AC_SUBST([XSDL_INCS])
 AC_SUBST([XSDL_DIRS])
 
-XORG_LIBS=
-XORG_INCS=
-XORG_OS=
-if test "$XORGSERVER" = yes; then
-	XORG_INC='-I$(top_srcdir)/hw/xorg/include \\\
-	-I$(top_srcdir)/hw/xorg/common \\\
-	-I$(top_srcdir)/hw/xorg/os-support \\\
-	-I$(top_srcdir)/include \\\
-	-I$(top_srcdir)/os \\\
-	-I$(top_srcdir)/hw/xorg/os-support/bus'
-	XORG_CORE_LIBS="$DIX_LIB"
-	XORG_LIBS="$FB_LIB $MI_LIB $XI_LIB $XKB_LIB $EXTENSION_LIBS \
-	           $DAMAGE_LIB $SHADOW_LIB $XPSTUBS_LIB $OS_LIB"
-	XORG_INCS="$XORG_INC $EXTENSION_INCS $MI_INC $DAMAGE_INC \
-	           $SHADOW_INC $FB_INC $XSERVER_CFLAGS $XI_INC"
-	XORG_CFLAGS="$XORGSERVER_CFLAGS -D_XOPEN_SOURCE -D_POSIX_SOURCE=500 \
-	             -D_BSD_SOURCE -Wall -DNEED_XF86_TYPES \
-	             -DNEED_XF86_PROTOTYPES -DXFree86Server \
-	             -DX_BYTE_ORDER=X_LITTLE_ENDIAN"
-	case $host_os in
-	  linux-gnu*)
-	  	# support: yea
-	  	XORG_OS="linux"
-		XORG_OS_SUBDIR="linux"
-		;;
-	  freebsd*)
-	  	# support: nay
-		# daniel has an account on an fbsd box, working on this
-		# jaymz too
-	  	XORG_OS="freebsd"
-		XORG_OS_SUBDIR="bsd"
-		;;
-	  netbsd*)
-	  	# support: nay
-	  	# volunteers?
-	  	XORG_OS="netbsd"
-		XORG_OS_SUBDIR="bsd"
-		;;
-	  openbsd*)
-	  	# support: nay
-	  	# volunteers?
-	  	XORG_OS="openbsd"
-		XORG_OS_SUBDIR="bsd"
-		;;
-	  solaris*)
-	  	# support: nay
-	  	XORG_OS="solaris"
-		XORG_OS_SUBDIR="solaris"
-		;;
-	  *)
-	  	XORG_OS="unknown"
-		XORG_OS_SUBDIR="unknown"
-		AC_MSG_ERROR([Your OS is unknown. Xorg currently only supports Linux, Free/Open/NetBSD, and Solaris. If you are interested in porting Xorg to your platform, please email xserver at freedesktop.org.])
-		;;
-	esac
-	case $host_cpu in
-	  sparc*)
-	  	xorg_bus_sbus="yes"
-		;;
-	esac
-fi
-AC_SUBST([XORG_CORE_LIBS])
-AC_SUBST([XORG_LIBS])
-AC_SUBST([XORG_INCS])
-AC_SUBST([XORG_CFLAGS])
-AC_SUBST([XORG_OS])
-AC_SUBST([XORG_OS_SUBDIR])
-AM_CONDITIONAL([XORG_BUS_SBUS], [test "x$xorg_bus_sbus" = xyes])
-
 XGL_LIBS=
 XGL_INCS=
 XGL_PURE_LIBS=
@@ -622,30 +543,5 @@
 hw/kdrive/i810/Makefile
 hw/xnest/Makefile
 hw/xwin/Makefile
-hw/xorg/Makefile
-hw/xorg/common/Makefile
-hw/xorg/ddc/Makefile
-hw/xorg/drivers/Makefile
-hw/xorg/drivers/ati/Makefile
-hw/xorg/drivers/nv/Makefile
-hw/xorg/drivers/fbdev/Makefile
-hw/xorg/dummylib/Makefile
-hw/xorg/fbdevhw/Makefile
-hw/xorg/i2c/Makefile
-hw/xorg/input/Makefile
-hw/xorg/input/mouse/Makefile
-hw/xorg/int10/Makefile
-hw/xorg/os-support/Makefile
-hw/xorg/os-support/bus/Makefile
-hw/xorg/os-support/linux/Makefile
-hw/xorg/os-support/linux/drm/Makefile
-hw/xorg/os-support/linux/int10/Makefile
-hw/xorg/parser/Makefile
-hw/xorg/rac/Makefile
-hw/xorg/ramdac/Makefile
-hw/xorg/shadowfb/Makefile
-hw/xorg/vbe/Makefile
-hw/xorg/vgahw/Makefile
-hw/xorg/xaa/Makefile
 hw/xgl/Makefile
 ])