summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2010-11-09 13:33:55 -0800
committerKeith Packard <keithp@keithp.com>2010-11-10 16:20:52 -0800
commit291c39dfef84d1b204d7f5e63e925dee2dbdaca7 (patch)
treef92289c4b62c4c2ae19dc275c6653c7329edde74
parentf0b4df99486066ad0e638b3b5debc905bc8ef1c4 (diff)
DOC: Only build dtrace documentation with --enable-docs
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--configure.ac1
-rw-r--r--doc/xml/dtrace/Makefile.am2
2 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index e8f947316..bd027cd07 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 0e25e5d43..a95d37418 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)