summaryrefslogtreecommitdiff
path: root/lib/libxtrans/xtrans.m4
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2008-05-24 15:44:22 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2008-05-24 15:44:22 +0000
commit8d1f1e51a94b497e7d18f4eab311962119d29f2b (patch)
tree7d3f3e2072bbe8cc8a2648883615d9a8c74c821f /lib/libxtrans/xtrans.m4
parentd9c081456b4e271f93cfc07c3a66663f188edf7a (diff)
Update to libxtrans 1.2
Diffstat (limited to 'lib/libxtrans/xtrans.m4')
-rw-r--r--lib/libxtrans/xtrans.m418
1 files changed, 14 insertions, 4 deletions
diff --git a/lib/libxtrans/xtrans.m4 b/lib/libxtrans/xtrans.m4
index 1d80595ad..31d456b41 100644
--- a/lib/libxtrans/xtrans.m4
+++ b/lib/libxtrans/xtrans.m4
@@ -52,6 +52,12 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
#include <sys/socket.h>
#include <netinet/in.h>
])
+
+ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
+ AC_CHECK_TYPES([socklen_t], [], [], [
+AC_INCLUDES_DEFAULT
+#include <sys/socket.h>])
+
]) # XTRANS_TCP_FLAGS
# XTRANS_CONNECTION_FLAGS()
@@ -61,17 +67,21 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([AC_TYPE_SIGNAL])
+ [case $host_os in
+ mingw*) unixdef="no" ;;
+ *) unixdef="yes" ;;
+ esac]
AC_ARG_ENABLE(unix-transport,
AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]),
- [UNIXCONN=$enableval], [UNIXCONN=yes])
- AC_ARG_ENABLE(tcp-transport,
- AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
- [TCPCONN=$enableval], [TCPCONN=yes])
+ [UNIXCONN=$enableval], [UNIXCONN=$unixdef])
AC_MSG_CHECKING([if Xtrans should support UNIX socket connections])
if test "$UNIXCONN" = "yes"; then
AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
fi
AC_MSG_RESULT($UNIXCONN)
+ AC_ARG_ENABLE(tcp-transport,
+ AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
+ [TCPCONN=$enableval], [TCPCONN=yes])
AC_MSG_CHECKING([if Xtrans should support TCP socket connections])
AC_MSG_RESULT($TCPCONN)
if test "$TCPCONN" = "yes"; then