X11 ChangeLog,1.37,1.38 configure.ac,1.28,1.29

[Phil Blundell]

Committed by: pb

Update of /cvs/xlibs/X11
In directory pdx:/tmp/cvs-serv2992

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.


Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/X11/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- a/ChangeLog	7 May 2004 02:03:11 -0000	1.37
+++ b/ChangeLog	3 Jun 2004 14:02:50 -0000	1.38
@@ -1,3 +1,9 @@
+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.
+
 2004-05-06  Eric Anholt  <anholt at FreeBSD.org>
 
 	* src/Makefile.am:

Index: configure.ac
===================================================================
RCS file: /cvs/xlibs/X11/configure.ac,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- a/configure.ac	17 Mar 2004 18:06:35 -0000	1.28
+++ b/configure.ac	3 Jun 2004 14:02:50 -0000	1.29
@@ -60,6 +60,20 @@
 AC_SUBST(XDMCP_CFLAGS)
 AC_SUBST(XDMCP_LIBS)
 
+# Transport selection
+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
+
 # Check for dlopen
 AC_SEARCH_LIBS(dlopen,[dl svld])
 if test x$ac_cv_search_dlopen = xno; then