nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source
This commit is contained in:
Nick Mathewson 2014-02-17 23:06:34 +00:00
commit bafae045ba
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug10929 Normal file
View File

@ -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.

2
configure.ac
View File

@ -191,7 +191,7 @@ AC_CHECK_PROG([SED],[sed],[sed],[/bin/false])
dnl check for asciidoc and a2x dnl check for asciidoc and a2x
AC_PATH_PROG([ASCIIDOC], [asciidoc], none) 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) AM_CONDITIONAL(USE_ASCIIDOC, test x$asciidoc = xtrue)