[xserver-commit] xserver ChangeLog,3.141,3.142 configure.ac,3.60,3.61
Daniel Stone
xserver-commit@pdx.freedesktop.org
Committed by: daniel
Update of /cvs/xserver/xserver
In directory pdx:/tmp/cvs-serv4807
Modified Files:
ChangeLog configure.ac
Log Message:
Make the default KDrive, to prevent confusion. I didn't mean to commit the
Xizzle configure.ac stuff - whoops.
Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.141
retrieving revision 3.142
diff -u -d -r3.141 -r3.142
--- a/ChangeLog 7 Mar 2004 12:06:52 -0000 3.141
+++ b/ChangeLog 7 Mar 2004 12:09:17 -0000 3.142
@@ -3,6 +3,11 @@
Renaming the XFree86 DDX to 'Xizzle' per Mike Harris's suggestion. There
was too much confusion.
+ * configure.ac:
+ Drag the Xizzle stuff in (this was originally done by accident); ensure
+ that KDrive is the default to prevent confusion. Hell, Xizzle doesn't
+ even *build* yet.
+
2004-03-07 Daniel Stone <daniel@freedesktop.org>
* Xext/Makefile.am, Xext/panoramiX*:
Fix up the PanoramiX build so it actually works and does something
Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.60
retrieving revision 3.61
diff -u -d -r3.60 -r3.61
--- a/configure.ac 28 Feb 2004 09:47:55 -0000 3.60
+++ b/configure.ac 7 Mar 2004 12:09:17 -0000 3.61
@@ -31,6 +31,7 @@
AM_CONFIG_HEADER(include/config.h)
AC_PROG_CC
+AM_PROG_AS
AC_PROG_INSTALL
AC_PROG_LN_S
AC_LIBTOOL_WIN32_DLL
@@ -76,7 +77,7 @@
# tslib touchscreen driver
AC_CHECK_HEADERS([tslib.h])
-REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau"
+REQUIRED_MODULES="randr render fixesext damageext panoramixext xextensions xfont xproto xtrans xau"
DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
DEFAULT_VENDOR_STRING="freedesktop.org"
@@ -84,40 +85,28 @@
EXTENSION_LIBS='$(top_builddir)/Xext/libXext.a'
EXTENSION_INCS='-I$(top_srcdir)/Xext'
-AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror],[]),
- [WERROR=$enableval],[WERROR=no])
-AC_ARG_ENABLE(xv, AS_HELP_STRING([--disable-xv],[Disable VIDEO extension]),
- [XV=$enableval],[XV=yes])
-AC_ARG_ENABLE(composite, AS_HELP_STRING([--disable-composite],[Disable COMPOSITE extension]),
- [COMPOSITE=$enableval],[COMPOSITE=yes])
-AC_ARG_ENABLE(mitshm, AS_HELP_STRING([--disable-shm],[Disable MIT-SHM extension]),
- [MITSHM=$enableval],[MITSHM=yes])
-AC_ARG_ENABLE(xres, AS_HELP_STRING([--disable-xres],[]),
- [RES=$enableval],[RES=yes])
-AC_ARG_ENABLE(kdriveserver, AS_HELP_STRING([--disable-kdriveserver],[Disable kdrive servers]),
- [KDRIVESERVER=$enableval],[KDRIVESERVER=yes])
-AC_ARG_ENABLE(xnestserver, AS_HELP_STRING([--disable-xnestserver],[Disable Xnest server]),
- [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],[]),
- [USE_RGB_BUILTIN=$enableval],[USE_RGB_BUILTIN=yes])
-AC_ARG_ENABLE(screensaver, AS_HELP_STRING([--disable-screensaver],[Disable screensaver extension]),
- [SCREENSAVER=$enableval],[SCREENSAVER=yes])
-AC_ARG_ENABLE(xdmcp, AS_HELP_STRING([--disable-xdmcp],[Disable XDMCP support]),
- [XDMCP=$enableval],[XDMCP=auto])
-AC_ARG_ENABLE(xdm-auth-1, AS_HELP_STRING([--disable-xdm-auth-1],[Disable auth-1 authentication]),
- [XDMAUTH=$enableval],[XDMAUTH=auto])
-AC_ARG_ENABLE(glx, AS_HELP_STRING([--enable-glx],[Enable GLX extension]),
- [GLX=$enableval],[GLX=no])
-AC_ARG_ENABLE(dri, AS_HELP_STRING([--enable-dri],[Enable direct rendering]),
- [DRI=$enableval],[DRI=no])
-AC_ARG_ENABLE(xinput, AS_HELP_STRING([--enable-xinput],[Enable INPUT extension]),
- [XINPUT=$enableval],[XINPUT=no])
+AC_ARG_ENABLE(werror, [ --enable-werror ],[WERROR=$enableval],[WERROR=no])
+AC_ARG_ENABLE(shape, [ --disable-shape ],[SHAPE=$enableval],[SHAPE=yes])
+AC_ARG_ENABLE(xv, [ --disable-xv ],[XV=$enableval],[XV=yes])
+AC_ARG_ENABLE(composite, [ --disable-composite ],[COMPOSITE=$enableval],[COMPOSITE=yes])
+AC_ARG_ENABLE(mitshm, [ --disable-shm ],[MITSHM=$enableval],[MITSHM=yes])
+AC_ARG_ENABLE(xres, [ --disable-xres ],[RES=$enableval],[RES=yes])
+AC_ARG_ENABLE(kdriveserver, [ --enable-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(xizzleserver, [ --disable-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])
+AC_ARG_ENABLE(screensaver, [ --disable-screensaver ],
+ [SCREENSAVER=$enableval],
+ [SCREENSAVER=yes])
+AC_ARG_ENABLE(xdmcp, [ --disable-xdmcp ],[XDMCP=$enableval],[XDMCP=auto])
+AC_ARG_ENABLE(xdm-auth-1, [ --disable-xdm-auth-1 ],[XDMAUTH=$enableval],[XDMAUTH=auto])
+AC_ARG_ENABLE(glx, [ --enable-glx ],[GLX=$enableval],[GLX=no])
+AC_ARG_ENABLE(dri, [ --enable-dri ],[DRI=$enableval],[DRI=no])
+AC_ARG_ENABLE(xinput, [ --enable-xinput ],[XINPUT=$enableval],[XINPUT=no])
+AC_ARG_ENABLE(xloadable, [ --enable-xloadable ],[XLOADABLE=$enableval],[XLOADABLE=no])
+AC_ARG_ENABLE(xinerama, [ --disable-xinerama ],[XINERAMA=$enableval],[XINERAMA=yes])
AC_ARG_WITH(mesa-source, [ --with-mesa-source=PATH ],
[MESA_SOURCE="$withval"],
@@ -132,6 +121,11 @@
[ VENDOR_RELEASE="$withval" ],
[ VENDOR_RELEASE="$DEFAULT_VENDOR_RELEASE" ])
+AM_CONDITIONAL(SHAPE, test x$SHAPE = xyes)
+if test "$SHAPE" = yes; then
+ AC_DEFINE(SHAPE,1,[Support SHAPE extension])
+fi
+
AM_CONDITIONAL(XV, [test x$XV = xyes])
if test "$XV" = yes; then
AC_DEFINE(XV,1,[Support Xv Extension])
@@ -165,6 +159,12 @@
XWIN_REQUIRED_MODULES="x11"
fi
+AM_CONDITIONAL(XIZZLESERVER, [test x$XIZZLESERVER = xyes])
+if test "$XIZZLESERVER" = yes; then
+ AC_DEFINE(XIZZLESERVER,,[Build XFree86 server])
+ XIZZLE_REQUIRED_MODULES="x11 xext xfont xdmcp"
+fi
+
AM_CONDITIONAL(XTRAP, [test x$XTRAP = xyes])
if test "$XTRAP" = yes; then
AC_DEFINE(XTRAP,1,[Support XTrap extension])
@@ -190,16 +190,24 @@
AM_CONDITIONAL(DRI, test x$DRI = xyes)
if test "$DRI" = yes; then
- AC_DEFINE(XF86DRI,1,[Build DRI extension])
- AC_DEFINE(_XF86DRI_SERVER_,1,[XF86DRI internal define])
+ AC_DEFINE(XIZZLEDRI,1,[Build DRI extension])
+ AC_DEFINE(_XIZZLEDRI_SERVER_,1,[XIZZLEDRI internal define])
fi
-
AM_CONDITIONAL(XINPUT, [test x$XINPUT = xyes])
if test "$XINPUT" = yes; then
AC_DEFINE(XINPUT,1,[Support X Input extension])
REQUIRED_MODULES="$REQUIRED_MODULES xi"
- EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/Xi/libXi.a'
- dnl EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_builddir)/Xi/'
+fi
+
+AM_CONDITIONAL(XINERAMA, [test x$XINERAMA = xyes])
+if test "$XINERAMA" = yes; then
+ AC_DEFINE(XINERAMA,1,[Support Xinerama extension])
+ AC_DEFINE(PANORAMIX,1,[Internal define for Xinerama])
+fi
+
+AM_CONDITIONAL(XLOADABLE, [test x$XLOADABLE = xyes])
+if test "$XLOADABLE" = yes; then
+ AC_DEFINE(XLOADABLE,1,[Support loadable input and output drivers])
fi
PKG_CHECK_MODULES(XDMCP, xdmcp, [have_libxdmcp="yes"], [have_libxdmcp="no"])
@@ -300,8 +308,11 @@
AC_DEFINE(SMART_SCHEDULE,1,[Include time-based scheduler])
AC_DEFINE(NDEBUG,1,[Disable some debugging code])
AC_DEFINE(USE_RGB_TXT,1,[Use rgb.txt directly])
+AC_DEFINE(MITMISC,1,[Support MIT Misc extension])
AC_DEFINE(XTEST,1,[Support XTest extension])
AC_DEFINE(XSYNC,1,[Support XSync extension])
+AC_DEFINE(XCMISC,1,[Support XCMisc extension])
+AC_DEFINE(BIGREQS,1,[Support BigRequests extension])
AC_DEFINE(PIXPRIV,1,[Support pixmap privates])
AC_DEFINE(XFIXES,1,[Support XFixes extension])
EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/xfixes/libxfixes.a'
@@ -334,8 +345,6 @@
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'
@@ -347,16 +356,9 @@
$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=
@@ -388,22 +390,73 @@
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
+XIZZLE_LIBS=
+XIZZLE_INCS=
+XIZZLE_OS=
+if test "$XIZZLESERVER" = yes; then
+ PKG_CHECK_MODULES(XIZZLESERVER, $XIZZLE_REQUIRED_MODULES)
+ XIZZLE_LIB='$(top_builddir)/hw/xizzle/libxizzle.a'
+ XIZZLE_INC='-I$(top_srcdir)/hw/xizzle/include \\\
+ -I$(top_srcdir)/hw/xizzle/common \\\
+ -I$(top_srcdir)/hw/xizzle/os-support \\\
+ -I$(top_srcdir)/include \\\
+ -I$(top_srcdir)/hw/xizzle/os-support/bus'
+ XIZZLE_LIBS="$DIX_LIB $OS_LIB $EXTENSION_LIBS $MI_LIB \
+ $SHADOW_LIB $XIZZLESERVER_LIBS"
+ XIZZLE_INCS="$XIZZLE_INC $EXTENSION_INCS $MI_INC $XIZZLESERVER_INCS"
+ XIZZLE_CFLAGS="$XIZZLESERVER_CFLAGS -D_XOPEN_SOURCE -D_POSIX_SOURCE=500 \
+ -D_BSD_SOURCE -Wall -DNEED_XF86_TYPES"
+ case $host_os in
+ linux-gnu*)
+ # support: yea
+ XIZZLE_OS="linux"
+ XIZZLE_OS_SUBDIR="linux"
+ ;;
+ freebsd*)
+ # support: nay
+ # daniel has an account on an fbsd box, working on this
+ XIZZLE_OS="freebsd"
+ XIZZLE_OS_SUBDIR="bsd"
+ ;;
+ netbsd*)
+ # support: nay
+ # volunteers?
+ XIZZLE_OS="netbsd"
+ XIZZLE_OS_SUBDIR="bsd"
+ ;;
+ openbsd*)
+ # support: nay
+ # volunteers?
+ XIZZLE_OS="openbsd"
+ XIZZLE_OS_SUBDIR="bsd"
+ ;;
+ solaris*)
+ # support: nay
+ XIZZLE_OS="solaris"
+ XIZZLE_OS_SUBDIR="solaris"
+ ;;
+ *)
+ XIZZLE_OS="unknown"
+ XIZZLE_OS_SUBDIR="unknown"
+ AC_MSG_ERROR([Your OS is unknown. Xizzle currently only supports Linux, Free/Open/NetBSD, and Solaris. If you are interested in porting Xizzle to your platform, please email xserver@freedesktop.org.])
+ ;;
+ esac
+ case $host_cpu in
+ sparc*)
+ xizzle_bus_sbus="yes"
+ ;;
+ esac
fi
-AC_SUBST([XSDL_LIBS])
-AC_SUBST([XSDL_INCS])
-AC_SUBST([XSDL_DIRS])
+AC_SUBST([XIZZLE_LIBS])
+AC_SUBST([XIZZLE_INCS])
+AC_SUBST([XIZZLE_CFLAGS])
+AC_SUBST([XIZZLE_OS])
+AC_SUBST([XIZZLE_OS_SUBDIR])
+AM_CONDITIONAL([XIZZLE_BUS_SBUS], [test "x$xizzle_bus_sbus" = xyes])
AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS})
-XSERVER_CFLAGS="$XSERVER_CFLAGS "'-I${top_srcdir}/include'
+XSERVER_CFLAGS="$XSERVER_CFLAGS "'-I${top_srcdir}/include -I${top_srcdir}/Xext'
if test "x$GCC" = "xyes"; then
GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
@@ -454,7 +507,6 @@
damageext/Makefile
composite/Makefile
Xext/Makefile
-Xi/Makefile
hw/Makefile
hw/kdrive/Makefile
hw/kdrive/src/Makefile
@@ -467,8 +519,34 @@
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
+hw/xizzle/Makefile
+hw/xizzle/common/Makefile
+hw/xizzle/ddc/Makefile
+hw/xizzle/drivers/Makefile
+hw/xizzle/drivers/ati/Makefile
+hw/xizzle/dummylib/Makefile
+hw/xizzle/fbdevhw/Makefile
+hw/xizzle/i2c/Makefile
+hw/xizzle/int10/Makefile
+hw/xizzle/loader/Makefile
+hw/xizzle/os-support/Makefile
+hw/xizzle/os-support/bus/Makefile
+hw/xizzle/os-support/linux/Makefile
+hw/xizzle/os-support/linux/drm/Makefile
+hw/xizzle/os-support/linux/int10/Makefile
+hw/xizzle/parser/Makefile
+hw/xizzle/rac/Makefile
+hw/xizzle/ramdac/Makefile
+hw/xizzle/shadowfb/Makefile
+hw/xizzle/vbe/Makefile
+hw/xizzle/vgahw/Makefile
+hw/xizzle/xaa/Makefile
+hw/xizzle/xaa/lsb_first/Makefile
+hw/xizzle/xaa/msb_first/Makefile
+hw/xizzle/xaa/lsb_fixed/Makefile
+hw/xizzle/xaa/msb_fixed/Makefile
+hw/xizzle/Xi/Makefile
])