summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Bender <pebender@gmail.com>2010-06-03 11:17:45 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2010-06-03 12:45:33 -0700
commitd7f35946d673bb00f2768e025b6e1017422b2174 (patch)
tree927dbef9e88727167d0bc1f1361f8debadfd2b33
parentb2487d07f7b355f230a56e32c763acd08862735c (diff)
Bug 22590 - libX11 1.2.1 has broken abstract namespace support
https://bugs.freedesktop.org/show_bug.cgi?id=22590 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac4
-rw-r--r--src/ConnDis.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 502996a0..4247894e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,6 +141,10 @@ case $host_os in
# Unix domain sockets are faster now.
DEFAULT_LOCAL_TRANS="UNIX_TRANS,LOCAL_TRANS,TCP_TRANS"
;;
+ linux*)
+ # LOCAL_TRANS is used for abstract sockets.
+ DEFAULT_LOCAL_TRANS="LOCAL_TRANS,UNIX_TRANS,TCP_TRANS"
+ ;;
*)
if test "$LOCALCONN" = "yes"; then
DEFAULT_LOCAL_TRANS="LOCAL_TRANS,UNIX_TRANS,TCP_TRANS"
diff --git a/src/ConnDis.c b/src/ConnDis.c
index 197e14c7..e171940b 100644
--- a/src/ConnDis.c
+++ b/src/ConnDis.c
@@ -92,7 +92,7 @@ static char *copystring (const char *src, int len)
#ifdef UNIXCONN
# define UNIX_TRANS "unix"
#endif
-#if defined(LOCALCONN) || defined(OS2PIPECONN)
+#if defined(LOCALCONN) || defined(OS2PIPECONN) || defined(UNIXCONN)
# define LOCAL_TRANS "local"
#endif