frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use macros from xtrans.m4, issue error if not found.

This commit is contained in:
Alan Coopersmith 2005-09-03 03:27:55 +00:00
parent 733a6d7a26
commit 4b2f5ba1b5
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-02 Alan Coopersmith <alan.coopersmith@sun.com>
* configure.ac:
Use macros from xtrans.m4, issue error if not found.
2005-09-02 Daniel Stone <daniel@freedesktop.org> 2005-09-02 Daniel Stone <daniel@freedesktop.org>
* GL/mesa/X/Makefile.am: * GL/mesa/X/Makefile.am:

27
configure.ac
View File

@ -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(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]) AC_ARG_ENABLE(xprint, AS_HELP_STRING([--enable-xprint], [Build Xprint extension and server (default: auto)]), [XPRINT=$enableval], [XPRINT=auto])
dnl Transport selection dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro
AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes]) dnl was not expanded, since libX11 with no transport types is rather useless.
AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes]) dnl
AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes]) 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_VM86, [test "x$INT10" = xvm86])
AM_CONDITIONAL(INT10_X86EMU, [test "x$INT10" = xx86emu]) 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]) AC_CHECK_HEADERS([sys/vm86.h sys/io.h])
fi 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 ---------------------------------------------------------------------------
dnl Extension section dnl Extension section
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------