Merge remote-tracking branch 'rl1987/bug13228'

This commit is contained in:
Nick Mathewson 2014-09-29 08:55:17 -04:00
commit 56f92ca02d
2 changed files with 8 additions and 1 deletions

5
changes/bug13228 Normal file
View File

@ -0,0 +1,5 @@
o Build fixes:
- Improve configure script error message to make it clear
that compilation has failed and that user has to either
add --disable-asciidoc argument or install asciidoc.
Resolves ticket 13228.

View File

@ -1599,7 +1599,9 @@ if test x$asciidoc = xtrue && test "$ASCIIDOC" = "none" ; then
if ! [[ -f "$srcdir/$file.1.in" ]] || ! [[ -f "$srcdir/$file.html.in" ]] ; then
echo "==================================";
echo;
echo "You need asciidoc installed to be able to build the manpage.";
echo "Building Tor has failed since manpages cannot be built.";
echo;
echo "You need asciidoc installed to be able to build the manpages.";
echo "To build without manpages, use the --disable-asciidoc argument";
echo "when calling configure.";
echo;