[PATCH:libX11 1/2] Bug 22590 - libX11 1.2.1 has broken abstract namespace support

[Alan Coopersmith]

From: Paul Bender <pebender at gmail.com>

https://bugs.freedesktop.org/show_bug.cgi?id=22590

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 configure.ac  |    4 ++++
 src/ConnDis.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 502996a..4247894 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 197e14c..e171940 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
 
-- 
1.5.6.5