debrix ChangeLog,1.5,1.6 configure.ac,1.6,1.7

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/debrix
In directory pdx:/tmp/cvs-serv18452

Modified Files:
	ChangeLog configure.ac 
Log Message:
* configure.ac:
Minor cleanups; add some XKB defines.

* hw/xorg/common/debrixInit.c:
Add space in printed string (cosmetic).

* hw/xorg/loader/xf86sym.c:
Add in a bunch of symbols, so atimisc loads on my Mach64.

* xkb/Makefile.am:
Remove defines as per configure.ac.

* xkb/XKB*.c:
Add in a heap of missing #include <config.h>'s for xkbfile-derived
code.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/debrix/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	2 Jul 2004 21:16:03 -0000	1.5
+++ ChangeLog	6 Jul 2004 23:53:56 -0000	1.6
@@ -1,3 +1,18 @@
+2004-07-06  Daniel Stone  <daniel at freedesktop.org>
+
+	* configure.ac:
+	Minor cleanups; add some XKB defines.
+
+	* hw/xorg/common/debrixInit.c:
+	Add space in printed string (cosmetic).
+	
+	* hw/xorg/loader/xf86sym.c:
+	Add in a bunch of symbols, so atimisc loads on my Mach64.
+
+	* xkb/XKB*.c:
+	Add in a heap of missing #include <config.h>'s for xkbfile-derived
+	code.
+
 2004-07-02  Adam Jackson  <ajax at freedesktop.org>
 
 	* configure.ac, Makefile.am, afb/Makefile.am, hw/xorg/Makefile.am,

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/debrix/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- configure.ac	2 Jul 2004 21:16:03 -0000	1.6
+++ configure.ac	6 Jul 2004 23:53:56 -0000	1.7
@@ -1,24 +1,24 @@
 dnl
 dnl $Id$
 dnl
-dnl Copyright © 2003 Keith Packard
+dnl Copyright © 2003-2004 Keith Packard, Daniel Stone
 dnl
 dnl Permission to use, copy, modify, distribute, and sell this software and its
 dnl documentation for any purpose is hereby granted without fee, provided that
 dnl the above copyright notice appear in all copies and that both that
 dnl copyright notice and this permission notice appear in supporting
-dnl documentation, and that the name of Keith Packard not be used in
-dnl advertising or publicity pertaining to distribution of the software without
-dnl specific, written prior permission.  Keith Packard makes no
-dnl representations about the suitability of this software for any purpose.  It
-dnl is provided "as is" without express or implied warranty.
+dnl documentation, and that the names of Keith Packard and Daniel Stone not be
+dnl used in advertising or publicity pertaining to distribution of the software
+dnl without specific, written prior permission.  Keith Packard and Daniel Stone
+dnl make no representations about the suitability of this software for any
+dnl purpose.  It is provided "as is" without express or implied warranty.
 dnl
-dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl KEITH PACKARD AND DANIEL STONE DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+dnl SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+dnl IN NO EVENT SHALL KEITH PACKARD OR DANIEL STONE BE LIABLE FOR ANY SPECIAL,
+dnl INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+dnl LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+dnl OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 dnl PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl Process this file with autoconf to create configure.
@@ -111,15 +111,6 @@
 AC_ARG_ENABLE(unix-transport,[  --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
 AC_ARG_ENABLE(tcp-transport, [  --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes])
 AC_ARG_ENABLE(ipv6,          [  --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes])
-if test "$UNIXCONN" = "yes"; then
-	AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
-fi
-if test "$TCPCONN" = "yes"; then
-	AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
-fi
-if test "$IPV6CONN" = "yes"; then
-	AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
-fi
 
 AC_ARG_WITH(mesa-source,        [  --with-mesa-source=PATH ],
 				[MESA_SOURCE="$withval"],
@@ -164,10 +155,23 @@
 AM_CONDITIONAL(MITSHM, [test x$MITSHM = xyes])
 if test "$MITSHM" = yes; then
 	AC_DEFINE(MITSHM,1,[Support MIT-SHM Extension])
+	AC_DEFINE(HAS_SHM,1,[Support SHM])
+fi
+
+if test "$UNIXCONN" = "yes"; then
+	AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
+fi
+if test "$TCPCONN" = "yes"; then
+	AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
+fi
+if test "$IPV6CONN" = "yes"; then
+	AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
 fi
 
 AC_DEFINE(XORGSERVER,,[Build Xorg server])
-AC_DEFINE(XKB,,[Build Xkb])
+AC_DEFINE(XKB,1,[Build XKB])
+AC_DEFINE(XKB_IN_SERVER,1,[Build XKB server])
+AC_DEFINE(XKB_DFLT_DISABLED,0,[Enable XKB per default])
 AC_DEFINE(XINPUT,,[Build XInput])
 REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
 
@@ -415,6 +419,7 @@
 AC_DEFINE(XFree86XDGA,1,[Build XDGA support])
 AC_DEFINE(XFree86Server,1,[Building XFree86 server])
 AC_DEFINE(XFree86LOADER,1,[Building XFree86 loader])
+AC_DEFINE(DLOPEN_SUPPORT,1,[Building with libdl])
 AC_DEFINE(XF86BIGFONT,1,[Build XFree86 BigFont extension])
 AC_DEFINE(XResExtension,1,[Build XRes extension])
 AC_DEFINE(DPMSExtension,1,[Build DPMS extension])
@@ -444,7 +449,8 @@
 XORG_MODPATH="-DDEFAULT_MODULE_PATH=\\\"$driverdir\\\""
 XORG_LOGPATH="-DDEFAULT_LOGPREFIX=\\\"$localstatedir/log/Xorg.\\\""
 XORG_CONFPATH="-DXF86CONFIGFILE=\\\"$CONFIGFILE\\\"" 
-XORG_CFLAGS="$XORG_CFLAGS $XSERVER_CFLAGS $XORG_MODPATH $XORG_LOGPATH $XORG_CONFPATH"
+XORG_XKBBASE="-DXKB_BASE_DIRECTORY=\\\"$libdir/xkb\\\""
+XORG_CFLAGS="$XORG_CFLAGS $XSERVER_CFLAGS $XORG_MODPATH $XORG_LOGPATH $XORG_CONFPATH $XORG_XKBBASE"
 AC_SUBST([XORG_CFLAGS])
 
 CFLAGS="$XORG_CFLAGS $CFLAGS"