Merge branch 'master' of ssh+git://sandmann@git.freedesktop.org/git/xorg/xserver

This commit is contained in:
Søren Sandmann Pedersen
2007-08-21 14:26:34 -04:00
16 changed files with 201 additions and 43 deletions

View File

@@ -597,6 +597,7 @@ XTRANS_CONNECTION_FLAGS
# Secure RPC detection macro from xtrans.m4
XTRANS_SECURE_RPC_FLAGS
AM_CONDITIONAL(SECURE_RPC, [test "x$SECURE_RPC" = xyes])
AM_CONDITIONAL(INT10_VM86, [test "x$INT10" = xvm86])
AM_CONDITIONAL(INT10_X86EMU, [test "x$INT10" = xx86emu])