diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-17 23:06:34 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-17 23:06:34 +0000 |
| commit | bafae045ba4a117e2685a925f8a3e21e68368ed4 (patch) | |
| tree | a2ca23d730b223b8daddec8a5c13481c801171dd | |
| parent | 3899cde2cb8f02237fcb37c2c90ae01868ade200 (diff) | |
| parent | 9f38cd935009e1c962804fb82bf0b0e3834e856d (diff) | |
| download | tor-bafae045ba4a117e2685a925f8a3e21e68368ed4.tar.gz tor-bafae045ba4a117e2685a925f8a3e21e68368ed4.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
| -rw-r--r-- | changes/bug10929 | 6 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 7 insertions, 1 deletions
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. + diff --git a/configure.ac b/configure.ac index 871ca5613c..de3a0525bb 100644 --- a/configure.ac +++ b/configure.ac @@ -191,7 +191,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) |