[tor-commits] [tor/master] double-quotes and changes file for 6506.

nickm at torproject.org nickm at torproject.org
Fri May 24 18:44:08 UTC 2013


commit e7134c2375f3c577ab7dcc20c74c5773d1a5f37d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 24 14:43:57 2013 -0400

    double-quotes and changes file for 6506.
---
 changes/bug6506 |    4 ++++
 configure.ac    |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug6506 b/changes/bug6506
new file mode 100644
index 0000000..4c6f490
--- /dev/null
+++ b/changes/bug6506
@@ -0,0 +1,4 @@
+  o Minor features (build):
+    - Detect a missing asciidoc, and warn the user about it, during
+      configure, rather than at build time. Fixes issue 6506. Patch
+      from Arlo Breault.
diff --git a/configure.ac b/configure.ac
index 9a5d589..1e69ec4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1468,10 +1468,10 @@ AC_CONFIG_FILES([
         src/config/torrc.sample
 ])
 
-if test x$asciidoc = xtrue && test $ASCIIDOC = "none" ; then
+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 $srcdir/$file.1.in ]] || ! [[ -f $srcdir/$file.html.in ]] ; 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.";



More information about the tor-commits mailing list