svn merge ^/branches/released .

1 files changed, 80 insertions, 52 deletions

diff --git a/libX11/configure.ac b/libX11/configure.ac
index 9bfc9815b..dfd93605b 100644
--- a/libX11/configure.ac
+++ b/libX11/configure.ac
@@ -3,11 +3,13 @@
 

 AC_PREREQ(2.60)

 AC_INIT([libX11],

-        1.3.3,

+        1.3.4,

         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],

         libX11)

 AC_CONFIG_SRCDIR([Makefile.am])

 AC_CONFIG_MACRO_DIR([m4])

+AC_CANONICAL_BUILD

+AC_CANONICAL_HOST

 

 AM_INIT_AUTOMAKE([foreign dist-bzip2])

 AM_MAINTAINER_MODE

@@ -32,6 +34,7 @@ XORG_WITH_PS2PDF
 AC_PROG_LIBTOOL

 DOLT

 AC_PROG_CC

+PKG_PROG_PKG_CONFIG

 

 if test x"$CC_FOR_BUILD" = x; then

 	if test x"$cross_compiling" = xyes; then

@@ -42,6 +45,27 @@ if test x"$CC_FOR_BUILD" = x; then
 fi

 AC_SUBST([CC_FOR_BUILD])

 

+if test x"$CPPFLAGS_FOR_BUILD" = x; then

+	if test ! x"$cross_compiling" = xyes; then

+		CPPFLAGS_FOR_BUILD=${CPPFLAGS}

+	fi

+fi

+AC_SUBST(CPPFLAGS_FOR_BUILD)

+

+if test x"$CFLAGS_FOR_BUILD" = x; then

+	if test ! x"$cross_compiling" = xyes; then

+		CFLAGS_FOR_BUILD=${CFLAGS}

+	fi

+fi

+AC_SUBST(CFLAGS_FOR_BUILD)

+

+if test x"$LDFLAGS_FOR_BUILD" = x; then

+	if test ! x"$cross_compiling" = xyes; then

+		LDFLAGS_FOR_BUILD=${LDFLAGS}

+	fi

+fi

+AC_SUBST(LDFLAGS_FOR_BUILD)

+

 XORG_PROG_RAWCPP

 

 # Find perl for "make check" tests in nls/localerules.in

@@ -53,44 +77,14 @@ AC_ARG_WITH(perl,
 	AC_CHECK_PROGS([PERL], [perl], [no]))

 AM_CONDITIONAL(HAVE_PERL, test x$PERL != xno)

 

-# Build with XCB support?

-AC_ARG_WITH(xcb,

-	AC_HELP_STRING([--with-xcb], [use XCB for low-level protocol implementation]),

-	[ac_cv_use_xcb=$withval], [ac_cv_use_xcb=yes])

-AC_CACHE_CHECK([whether to use XCB], [ac_cv_use_xcb], [ac_cv_use_xcb=yes])

-AM_CONDITIONAL(XCB, test x$ac_cv_use_xcb != xno)

-

 # Checks for pkg-config packages

 

 # Always required

-X11_REQUIRES='xproto >= 7.0.13 xextproto xtrans'

+X11_REQUIRES='xproto >= 7.0.13 xextproto xtrans xcb >= 1.1.92'

+X11_EXTRA_DEPS="xcb >= 1.1.92"

 

 PKG_PROG_PKG_CONFIG()

 

-case "$ac_cv_use_xcb" in

-no)

-	X11_REQUIRES="${X11_REQUIRES} xau xcmiscproto bigreqsproto"

-	X11_EXTRA_DEPS="xau"

-	PKG_CHECK_MODULES(XDMCP, xdmcp,

-		AC_CHECK_LIB(Xdmcp, XdmcpWrap,

-			[

-			AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS])

-			X11_EXTRA_DEPS="$X11_EXTRA_DEPS xdmcp"

-			],

-			[

-			XDMCP_CFLAGS=

-			XDMCP_LIBS=

-			], [$XDMCP_LIBS]),

-		[AC_MSG_RESULT(no)])

-	AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation])

-	;;

-*)

-	X11_REQUIRES="${X11_REQUIRES} xcb >= 1.1.92"

-	X11_EXTRA_DEPS="xcb >= 1.1.92"

-	xdmauth="no" # XCB handles all auth

-	AC_DEFINE(USE_XCB, 1, [Use XCB for low-level protocol implementation])

-	;;

-esac

 AC_SUBST(X11_EXTRA_DEPS)

 

 dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro

@@ -110,18 +104,64 @@ XTRANS_SECURE_RPC_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.

-		DEFAULT_LOCAL_TRANS="UNIX_TRANS,LOCAL_TRANS,TCP_TRANS"

+		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

-			DEFAULT_LOCAL_TRANS="LOCAL_TRANS,UNIX_TRANS,TCP_TRANS"

-		else

-			DEFAULT_LOCAL_TRANS="UNIX_TRANS,TCP_TRANS"

+		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

@@ -268,24 +308,13 @@ fi
 AC_SUBST(XTHREADLIB)

 AC_SUBST(XTHREAD_CFLAGS)

 

-case x$xdmauth in

-xyes)

-	XDMCP_CFLAGS="$XDMCP_CFLAGS -DHASXDMAUTH"

-	;;

-xno)

-	XDMCP_LIBS=""

-	;;

-esac

-AC_SUBST(XDMCP_CFLAGS)

-AC_SUBST(XDMCP_LIBS)

-

 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )

 

 #

 # Find keysymdef.h

 #

 AC_MSG_CHECKING([keysymdef.h])

-dir=`pkg-config --variable=includedir xproto`

+dir=`$PKG_CONFIG --variable=includedir xproto`

 KEYSYMDEF="$dir/X11/keysymdef.h"

 if test -f "$KEYSYMDEF"; then

         AC_MSG_RESULT([$KEYSYMDEF])

@@ -509,7 +538,7 @@ AC_OUTPUT([Makefile
 	   x11.pc

 	   x11-xcb.pc])

 

-man_pages_suffix=$LIBMAN_SUFFIX

+man_pages_suffix=$LIB_MAN_SUFFIX

 if test -z "$man_pages_suffix"; then

     man_pages_suffix=none

 fi

@@ -518,7 +547,6 @@ echo ""
 echo "X11 will be built with the following settings:"

 echo " Loadable i18n module support:            "$XLIB_LOADABLE_I18N

 echo " Loadable xcursor library support:        "$XLIB_LOADABLE_XCURSOR

-echo " Use XCB:                                 "$ac_cv_use_xcb

 echo " Threading support:                       "$xthreads

 echo " Use Threads safe API:                    "$mtsafeapi

 echo " Threads stubs in libX11:                 "$thrstubs