diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2010-11-09 13:33:55 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2010-11-13 15:26:56 -0800 |
| commit | 2715529d6b1da1e7b0266e66eba1aa50027c7c86 (patch) | |
| tree | 341c4f6b6481556e6e1f38ab0ccb8137fba26c0d | |
| parent | 4a7b5a33e1f9e53c9cd19d6790d0d48f05cb54d4 (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>
(cherry picked from commit 291c39dfef84d1b204d7f5e63e925dee2dbdaca7)
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | doc/xml/dtrace/Makefile.am | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 6f8b5da7a..1f014eddb 100644 --- a/configure.ac +++ b/configure.ac @@ -718,6 +718,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) |