diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-29 08:55:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-29 08:55:17 -0400 |
| commit | 56f92ca02d2fb972bc476f235a545b3dc764f58d (patch) | |
| tree | c053ea8b87f936ea33d38312e3bc9c22907b2c97 | |
| parent | b45bfba2ce3754aa8107717e638b325dd30f05ed (diff) | |
| parent | f20c72f45647cf869f02a60addc9e079760ee763 (diff) | |
| download | tor-56f92ca02d2fb972bc476f235a545b3dc764f58d.tar.gz tor-56f92ca02d2fb972bc476f235a545b3dc764f58d.zip | |
Merge remote-tracking branch 'rl1987/bug13228'
| -rw-r--r-- | changes/bug13228 | 5 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changes/bug13228 b/changes/bug13228 new file mode 100644 index 0000000000..0de013cb51 --- /dev/null +++ b/changes/bug13228 @@ -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. diff --git a/configure.ac b/configure.ac index bd46a7c662..73499c22ef 100644 --- a/configure.ac +++ b/configure.ac @@ -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; |