From 4b2f5ba1b5d59fd6bd7f82da5730f72e8df04858 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 3 Sep 2005 03:27:55 +0000 Subject: [PATCH] Use macros from xtrans.m4, issue error if not found. --- ChangeLog | 5 +++++ configure.ac | 27 +++++++++++++-------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b863fd0f..e4acef8d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-02 Alan Coopersmith + + * configure.ac: + Use macros from xtrans.m4, issue error if not found. + 2005-09-02 Daniel Stone * GL/mesa/X/Makefile.am: diff --git a/configure.ac b/configure.ac index cd9872c22..136852447 100644 --- a/configure.ac +++ b/configure.ac @@ -244,11 +244,20 @@ AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build Xnest serv AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto]) AC_ARG_ENABLE(xprint, AS_HELP_STRING([--enable-xprint], [Build Xprint extension and server (default: auto)]), [XPRINT=$enableval], [XPRINT=auto]) -dnl Transport selection -AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes]) -AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes]) -AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes]) +dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro +dnl was not expanded, since libX11 with no transport types is rather useless. +dnl +dnl If you're seeing an error here, be sure you installed the lib/xtrans module +dnl first and if it's not in the default location, that you set the ACLOCAL +dnl environment variable to find it, such as: +dnl ACLOCAL="aclocal -I ${PREFIX}/share/aclocal" +m4_pattern_forbid(XTRANS_CONNECTION_FLAGS) +# Transport selection macro from xtrans.m4 +XTRANS_CONNECTION_FLAGS + +# Secure RPC detection macro from xtrans.m4 +XTRANS_SECURE_RPC_FLAGS AM_CONDITIONAL(INT10_VM86, [test "x$INT10" = xvm86]) AM_CONDITIONAL(INT10_X86EMU, [test "x$INT10" = xx86emu]) @@ -258,16 +267,6 @@ if test "x$INT10" = xyes; then AC_CHECK_HEADERS([sys/vm86.h sys/io.h]) fi -if test "x$UNIXCONN" = xyes; then - AC_DEFINE(UNIXCONN, 1, [Support UNIX socket connections]) -fi -if test "x$TCPCONN" = xyes; then - AC_DEFINE(TCPCONN, 1, [Support TCP socket connections]) -fi -if test "x$IPV6CONN" = xyes; then - AC_DEFINE(IPv6, 1, [Support IPv6 for TCP connections]) -fi - dnl --------------------------------------------------------------------------- dnl Extension section dnl ---------------------------------------------------------------------------