From fca673bcd32e184a520edec2b93bc369c29ffe7d Mon Sep 17 00:00:00 2001 From: Sebastian Hahn Date: Mon, 8 Mar 2010 21:01:52 +0100 Subject: Don't require asciidoc when building Tor from a tarball If asciidoc is required, the user receives an error message telling them about the --disable-asciidoc configure switch and the build breaks. --- doc/asciidoc-helper.sh | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh index d24b31918..8e9e5eda3 100755 --- a/doc/asciidoc-helper.sh +++ b/doc/asciidoc-helper.sh @@ -17,11 +17,32 @@ output=$3 if [ "$1" = "html" ]; then input=${output%%.html.in}.1.txt base=${output%%.html.in} - "$2" -d manpage -o $output $input; + if [ "$2" != none ]; then + "$2" -d manpage -o $output $input; + else + 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 elif [ "$1" = "man" ]; then input=${output%%.1.in}.1.txt base=${output%%.1.in} + if test "$2" = none; 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 if "$2" -f manpage $input; then mv $base.1 $output; else @@ -35,3 +56,4 @@ elif [ "$1" = "man" ]; then exit 1; fi fi + -- cgit v1.2.3