[PATCH:libX11] Stop checking for preferred order of local transports

Alan Coopersmith alan.coopersmith at oracle.com
Fri Jan 22 11:47:31 PST 2016


Removes --with-local-transport-order=... flag to configure.

Code which used this ordered list was removed in commit 15e5eaf6289
which outsourced X11 connection handling & authentication to libxcb.

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 configure.ac | 72 ------------------------------------------------------------
 1 file changed, 72 deletions(-)

diff --git a/configure.ac b/configure.ac
index 20b01cd..b15194a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,78 +87,6 @@ m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$])
 # Transport selection macro from xtrans.m4
 XTRANS_CONNECTION_FLAGS
 
-# Preferred order to try transports for local connections
-AC_MSG_CHECKING([what order to try transports in for local connections])
-DEFAULT_LOCAL_TRANS=""
-case $host_os in
-	solaris*)
-		# On Solaris 2.6 through 9, named pipes (LOCAL_TRANS) were
-		# faster than Unix domain sockets, but on Solaris 10 & later,
-		# Unix domain sockets are faster now.
-		if test "$UNIXCONN" = "yes" ; then
-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
-			fi
-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}UNIX_TRANS"
-		fi
-		if test "$LOCALCONN" = "yes" ; then
-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
-			fi
-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS"
-		fi
-		if test "$TCPCONN" = "yes" ; then
-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
-			fi
-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"
-		fi
-		;;
-	linux*)
-		# LOCAL_TRANS is used for abstract sockets.
-		if test "$UNIXCONN" = "yes" ; then
-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
-			fi
-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS,UNIX_TRANS"
-		fi
-		if test "$TCPCONN" = "yes" ; then
-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
-			fi
-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"
-		fi
-		;;
-	*)
-		if test "$LOCALCONN" = "yes" ; then
-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
-			fi
-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS"
-		fi
-		if test "$UNIXCONN" = "yes" ; then
-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
-			fi
-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}UNIX_TRANS"
-		fi
-		if test "$TCPCONN" = "yes" ; then
-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
-			fi
-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"
-		fi
-		;;
-esac
-
-AC_ARG_WITH(local-transport-order,
-	AS_HELP_STRING([--with-local-transport-order=LIST], [preference sorted list of transport types to try for local connections]),
-	[LOCAL_TRANSPORT_LIST=$withval],
-	[LOCAL_TRANSPORT_LIST=$DEFAULT_LOCAL_TRANS])
-AC_DEFINE_UNQUOTED([LOCAL_TRANSPORT_LIST], [$LOCAL_TRANSPORT_LIST],
-   [preference sorted list of transport types to try for local connections])
-AC_MSG_RESULT([$LOCAL_TRANSPORT_LIST])
-
 # Check for dlopen
 AC_MSG_CHECKING([if run-time linking is supported])
 AC_SEARCH_LIBS(dlopen,[dl svld])
-- 
2.6.1



More information about the xorg-devel mailing list