[tor-commits] [tor/master] Config check for asciidoc and generated manpages.
nickm at torproject.org
nickm at torproject.org
Fri May 24 18:44:08 UTC 2013
commit f5cf614ed3bfdf14b16242d4f1bec086224acf4e
Author: Arlo Breault <arlolra at gmail.com>
Date: Tue May 14 10:18:28 2013 -0700
Config check for asciidoc and generated manpages.
If USE_ASCIIDOC is enabled but asciidoc isn't present and manpages
aren't already generated, it'll throw a warning during configure.
Works with the current git / tarball split.
Caveat: regular_mans are listed in the configure.ac
See #6506
---
configure.ac | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/configure.ac b/configure.ac
index 03155dc..2a53dd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1468,6 +1468,22 @@ AC_CONFIG_FILES([
src/config/torrc.sample
])
+if test x$asciidoc = xtrue && test $ASCIIDOC = "none" ; then
+ regular_mans=(doc/tor doc/tor-gencert doc/tor-resolve doc/torify)
+ for file in $regular_mans ; do
+ if ! [[ -f $file.1.in ]] || ! [[ -f $file.html.in ]] ; then
+ echo "==================================";
+ echo;
+ echo "You need asciidoc installed to be able to build the manpage.";
+ echo "To build without manpages, use the --disable-asciidoc argument";
+ echo "when calling configure.";
+ echo;
+ echo "==================================";
+ exit 1;
+ fi
+ done
+fi
+
AC_OUTPUT
if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then
More information about the tor-commits
mailing list