xserver ChangeLog,3.190,3.191 configure.ac,3.81,3.82

[Phil Blundell]

Committed by: pb

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
2004-06-03  Philip Blundell  <philb at gnu.org>

	* configure.ac: New options --disable-unix-transport,
	--disable-tcp-transport, --disable-ipv6.
	(UNIXCONN, TCPCONN, IPV6CONN): AC_DEFINE as appropriate.
	* os/xstrans.c (include): Include config.h.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.190
retrieving revision 3.191
diff -u -d -r3.190 -r3.191
--- a/ChangeLog	2 Jun 2004 21:22:21 -0000	3.190
+++ b/ChangeLog	3 Jun 2004 13:39:19 -0000	3.191
@@ -1,3 +1,10 @@
+2004-06-03  Philip Blundell  <philb at gnu.org>
+
+	* configure.ac: New options --disable-unix-transport,
+	--disable-tcp-transport, --disable-ipv6.
+	(UNIXCONN, TCPCONN, IPV6CONN): AC_DEFINE as appropriate.
+	* os/xstrans.c (include): Include config.h.	
+
 2004-06-02  Philip Blundell  <philb at gnu.org>
 
 	* configure.ac: Allow building without XCalibrate.

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.81
retrieving revision 3.82
diff -u -d -r3.81 -r3.82
--- a/configure.ac	2 Jun 2004 21:22:21 -0000	3.81
+++ b/configure.ac	3 Jun 2004 13:39:19 -0000	3.82
@@ -110,6 +110,18 @@
 AC_ARG_ENABLE(xinput,	     [  --enable-xinput ],[XINPUT=$enableval],[XINPUT=no])
 AC_ARG_ENABLE(xloadable,     [  --enable-xloadable ],[XLOADABLE=$enableval],[XLOADABLE=no])
 AC_ARG_ENABLE(xinerama,	     [  --enable-xinerama ],[XINERAMA=$enableval],[XINERAMA=no])
+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"],