1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
From 401ce869518455d2979dc785ae8431aa27937032 Mon Sep 17 00:00:00 2001
From: Andoni Morales Alastruey <ylatuya@gmail.com>
Date: Wed, 7 Mar 2012 12:48:54 +0100
Subject: [PATCH 1/6] Add option to disable doc
---
configure.ac | 18 +++++++++++++-----
doc/Makefile.am | 2 +-
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8260bdf..f4918a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,6 +409,19 @@ AC_ARG_ENABLE(examples,
[ ac_enable_examples=$enableval ], [ ac_enable_examples=yes] )
AM_CONDITIONAL(THEORA_ENABLE_EXAMPLES, [test "x${ac_enable_examples}" != xno])
+ac_enable_doc=yes
+AC_ARG_ENABLE(doc,
+ [ --disable-doc disable documentation ],
+ [ ac_enable_doc=$enableval ], [ ac_enable_doc=yes] )
+
+doc_build="no"
+if test $HAVE_DOXYGEN = "yes"; then
+if test $ac_build_doc = "yes"; then
+ doc_build="yes"
+fi
+fi
+AM_CONDITIONAL([BUILD_DOC], [test x$doc_build = xyes])
+
dnl --------------------------------------------------
dnl Check for headers
dnl --------------------------------------------------
@@ -471,11 +484,6 @@ AS_AC_EXPAND(INCLUDEDIR, ${includedir})
AS_AC_EXPAND(BINDIR, ${bindir})
AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
-if test $HAVE_DOXYGEN = "false"; then
- doc_build="no"
-else
- doc_build="yes"
-fi
if test $BUILD_SPEC = "false"; then
spec_build="no"
else
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 30eaad8..a81d63d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -12,7 +12,7 @@ doc_DATA = $(static_docs) doxygen-build.stamp
EXTRA_DIST = $(static_docs) Doxyfile.in
-if HAVE_DOXYGEN
+if BUILD_DOC
doxygen-build.stamp: Doxyfile $(top_srcdir)/include/theora/*.h
doxygen
touch doxygen-build.stamp
--
1.8.3.1
|
