Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Goulet
Tor
Commits
66a15013
Commit
66a15013
authored
Jun 16, 2019
by
rl1987
Browse files
Allow excluding documentation from the build
parent
319ce225
Changes
3
Hide whitespace changes
Inline
Side-by-side
changes/ticket19381
0 → 100644
View file @
66a15013
o Minor features (build system):
- Add --disable-manpage and --disable-html-manual options to configure
script. This will enable shortening build times by not building
documentation. Resolves issue 19381.
configure.ac
View file @
66a15013
...
...
@@ -105,6 +105,12 @@ if test "$enable_memory_sentinels" = "no"; then
[Defined if we're turning off memory safety code to look for bugs])
fi
AC_ARG_ENABLE(manpage,
AS_HELP_STRING(--disable-manpage, [Disable manpage generation.]))
AC_ARG_ENABLE(html-manual,
AS_HELP_STRING(--disable-html-manual, [Disable HTML documentation.]))
AC_ARG_ENABLE(asciidoc,
AS_HELP_STRING(--disable-asciidoc, [don't use asciidoc (disables building of manpages)]),
[case "${enableval}" in
...
...
@@ -299,6 +305,8 @@ AC_PATH_PROG([ASCIIDOC], [asciidoc], none)
AC_PATH_PROGS([A2X], [a2x a2x.py], none)
AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue")
AM_CONDITIONAL(BUILD_MANPAGE, [test "x$enable_manpage" != "xno"])
AM_CONDITIONAL(BUILD_HTML_DOCS, [test "x$enable_html_manual" != "xno"])
AM_PROG_CC_C_O
AC_PROG_CC_C99
...
...
doc/include.am
View file @
66a15013
...
...
@@ -15,17 +15,32 @@
all_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify doc/tor-print-ed-signing-cert
if USE_ASCIIDOC
nodist_man1_MANS = $(all_mans:=.1)
doc_DATA = $(all_mans:=.html)
txt_in = $(all_mans:=.1.txt)
if BUILD_HTML_DOCS
html_in = $(all_mans:=.html.in)
doc_DATA = $(all_mans:=.html)
else
html_in =
doc_DATA =
endif
if BUILD_MANPAGE
nodist_man1_MANS = $(all_mans:=.1)
man_in = $(all_mans:=.1.in)
txt_in = $(all_mans:=.1.txt)
else
nodist_man1_MANS =
man_in =
endif
else
html_in =
doc_DATA =
man_in =
txt_in =
nodist_man1_MANS =
doc_DATA =
endif
EXTRA_DIST+= doc/asciidoc-helper.sh \
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment