xserver: Branch 'master'

[Keith Packard]

 configure.ac               |    1 +
 doc/xml/dtrace/Makefile.am |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 291c39dfef84d1b204d7f5e63e925dee2dbdaca7
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Tue Nov 9 13:33:55 2010 -0800

    DOC: Only build dtrace documentation with --enable-docs
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index e8f9473..bd027cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -714,6 +714,7 @@ fi
 
 dnl Handle building documentation
 AM_CONDITIONAL(BUILDDOCS, test "x$BUILDDOCS" = xyes)
+XORG_ENABLE_DOCS
 XORG_ENABLE_DEVEL_DOCS
 XORG_WITH_XMLTO(0.0.20)
 XORG_WITH_FOP
diff --git a/doc/xml/dtrace/Makefile.am b/doc/xml/dtrace/Makefile.am
index 0e25e5d..a95d374 100644
--- a/doc/xml/dtrace/Makefile.am
+++ b/doc/xml/dtrace/Makefile.am
@@ -25,11 +25,13 @@ XML_FILES = Xserver-DTrace.xml
 
 include ../xmlrules.in
 
+if ENABLE_DOCS
 if XSERVER_DTRACE
 doc_DATA = $(BUILT_DOC_FILES)
 else
 noinst_DATA = $(BUILT_DOC_FILES)
 endif
+endif
 
 CLEANFILES = $(CLEAN_DOC_FILES)