xtrans:

Create autoconf macro XTRANS_CONNECTION_FLAGS to provide standard set of
    --enable flags for which transports to support and common place to
    update for required libraries for platforms that need certain libs for
    certain transports
ICE:
Add ICE_t #define required by Xtrans headers. Replace static defines of
    LOCALCONN & UNIXCONN with new XTRANS_CONNECTION_FLAGS macro.
X11:
Moved transport type checks to new macro XTRANS_CONNECTION_FLAGS in
    xtrans.m4 in xtrans module so they can be shared by all modules using
    xtrans.

3 files changed, 64 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 378069c..0bf1a19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-21  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* Makefile.am:
+	* xtrans.m4:
+	Create autoconf macro XTRANS_CONNECTION_FLAGS to provide 
+	standard set of --enable flags for which transports to
+	support and common place to update for required libraries
+	for platforms that need certain libs for certain transports.
+
 Fri May 13 11:15:48 2005  Søren Sandmann  <sandmann@redhat.com>
 
 	* ChangeLog, configure.ac: Dummy changes to see if that fixes
diff --git a/Makefile.am b/Makefile.am
index 2ba150c..3227b95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,9 @@ Xtransinclude_HEADERS = \
 	Xtransutil.c \
 	transport.c
 
+aclocaldir = $(datadir)/aclocal
+aclocal_DATA = xtrans.m4
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xtrans.pc
 
diff --git a/xtrans.m4 b/xtrans.m4
new file mode 100644
index 0000000..c0c90f2
--- /dev/null
+++ b/xtrans.m4
@@ -0,0 +1,52 @@
+dnl $XdotOrg: $
+dnl
+dnl Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+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.
+dnl 
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or substantial portions of the Software.
+dnl 
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl 
+dnl Except as contained in this notice, the name of the copyright holders shall
+dnl not be used in advertising or otherwise to promote the sale, use or
+dnl other dealings in this Software without prior written authorization
+dnl from the copyright holders.
+dnl 
+
+# XTRANS_CONNECTION_FLAGS()
+# -------------------------
+# Standard checks for Xtrans transport flags used by the Xorg packages
+# that use Xtrans functions
+AC_DEFUN([XTRANS_CONNECTION_FLAGS],
+[AC_ARG_ENABLE(unix-transport,[  --disable-unix-transport ], 
+	[UNIXCONN=$enableval], [UNIXCONN=yes])
+ AC_ARG_ENABLE(tcp-transport, [  --disable-tcp-transport ], 
+	[TCPCONN=$enableval], [TCPCONN=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])
+	# SVR4 hides these in libraries other than libc
+	AC_SEARCH_LIBS(socket, [socket])
+	AC_SEARCH_LIBS(gethostbyname, [nsl])
+ fi
+ # Needs to come after above checks for libsocket & libnsl for SVR4 systems
+ AC_ARG_ENABLE(ipv6,          [  --disable-ipv6 ], [IPV6CONN=$enableval], 
+	[AC_CHECK_FUNC(getaddrinfo,[IPV6CONN=yes],[IPV6CONN=no])])
+ if test "$IPV6CONN" = "yes"; then
+	AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
+ fi
+]) # XTRANS_CONNECTION_FLAGS
\ No newline at end of file