xserver: Branch 'master'

[David Nusinow]

 configure.ac           |    3 +++
 hw/xfree86/Makefile.am |    6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
diff-tree a10039a100dfe5f87e29e9cc4fa656176e0890f9 (from ce78b0cd2b1c35d60eb5683a1d00222aa4797c79)
Author: David Nusinow <dnusinow at debian.org>
Date:   Thu Sep 21 23:58:32 2006 -0400

    Allow the xfree86 ddx utils to be optionally built. Patch by Eugene Konev.

diff --git a/configure.ac b/configure.ac
index 798c8f0..76f5e04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -426,6 +426,7 @@ AC_ARG_ENABLE(dbe,            AS_HELP_ST
 AC_ARG_ENABLE(xf86bigfont,    AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes])
 AC_ARG_ENABLE(dpms,           AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
 AC_ARG_ENABLE(xinput,         AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
+AC_ARG_ENABLE(xfree86-utils,     AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
 
 dnl DDXes.
 AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@@ -735,6 +736,8 @@ if test "x$XINPUT" = xyes; then
 	XI_INC='-I$(top_srcdir)/Xi'
 fi
 
+AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
+
 AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
 
 AC_DEFINE(XKB, 1, [Build XKB])
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 67bfd80..5cce11d 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -2,12 +2,16 @@ if DRI
 DRI_SUBDIR = dri
 endif
 
+if XF86UTILS
+XF86UTILS_SUBDIR = utils
+endif
+
 DOC_SUBDIR = doc
 
 SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
           ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
 	  xf8_32bpp loader scanpci dixmods exa \
-	  $(DRI_SUBDIR) utils $(DOC_SUBDIR)
+	  $(DRI_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
 
 DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
                parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \