From a496010642c29018b5141991683a7d93dcf7d117 Mon Sep 17 00:00:00 2001 From: dana koch Date: Sat, 15 Feb 2014 21:46:55 +1100 Subject: [PATCH 1/2] Enveigle configure to look for a2x.py as well as a2x. It's not guaranteed that every package symlinks a2x to a2x.py; OpenBSD does not do this, so let's just look for a2x.py as well. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6f40ac4ad2..211d34c099 100644 --- a/configure.ac +++ b/configure.ac @@ -167,7 +167,7 @@ AC_CHECK_PROG([SED],[sed],[sed],[/bin/false]) dnl check for asciidoc and a2x AC_PATH_PROG([ASCIIDOC], [asciidoc], none) -AC_PATH_PROG([A2X], [a2x], none) +AC_PATH_PROGS([A2X], [a2x, a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test x$asciidoc = xtrue) From 9f38cd935009e1c962804fb82bf0b0e3834e856d Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 17 Feb 2014 23:06:18 +0000 Subject: [PATCH 2/2] add changes file for bug 10929 --- changes/bug10929 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changes/bug10929 diff --git a/changes/bug10929 b/changes/bug10929 new file mode 100644 index 0000000000..acf3960471 --- /dev/null +++ b/changes/bug10929 @@ -0,0 +1,6 @@ + - Minor bugfixes: + - Fix build warnings about missing "a2x" comment when building the + manpages from scratch on OpenBSD; OpenBSD calls it "a2x.py". + Fixes bug 10929; bugfix on tor-0.2.2.9-alpha. Patch from + Dana Koch. +