Merge branch 'master' into my-XACE-SELINUX

This commit is contained in:
Eamon Walsh 2006-12-19 16:11:19 -05:00 • committed by Eamon Walsh
commit a81dbaae05
83 changed files with 1701 additions and 1436 deletions

View file

@ -1021,7 +1021,7 @@ dnl ---------------------------------------------------------------------------
dnl DMX DDX
AC_MSG_CHECKING([whether to build Xdmx DDX])
PKG_CHECK_MODULES([DMXMODULES], [xmuu xext x11 xrender xfont xi dmxproto xau $XDMCP_MODULES], [have_dmx=yes], [have_dmx=no])
PKG_CHECK_MODULES([DMXMODULES], [xmuu xext x11 xrender xfixes xfont xi dmxproto xau $XDMCP_MODULES], [have_dmx=yes], [have_dmx=no])
if test "x$DMX" = xauto; then
DMX="$have_dmx"
fi