From 9fe1c000b0b1a91acf605ef71a538da7b7218fe9 Mon Sep 17 00:00:00 2001 From: Sebastian Hahn Date: Mon, 18 Jan 2010 22:15:38 +0100 Subject: Allow generating documentation from asciidoc in the Makefile --- configure.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 9a9650314..44ed292d5 100644 --- a/configure.in +++ b/configure.in @@ -109,6 +109,10 @@ AC_PROG_RANLIB dnl autoconf 2.59 appears not to support AC_PROG_SED 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_PROG([SHA1SUM], [sha1sum], none) AC_PATH_PROG([OPENSSL], [openssl], none) -- cgit v1.2.3 From a330cdc6fb9b02c3ee3d2282713a2052ff909b62 Mon Sep 17 00:00:00 2001 From: Sebastian Hahn Date: Tue, 19 Jan 2010 14:53:38 +0100 Subject: Convert the Tor manpage to asciidoc. This should be a very faithful conversion, preserving as much of the layout of the old manpage as possible. This wasn't possible for the nt-service and the DataDirectory/state parts. See a later commit for some small cleanups. Tiago Faria helped with the asciidoc conversion, big thanks! --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 44ed292d5..7727c9ed1 100644 --- a/configure.in +++ b/configure.in @@ -876,7 +876,7 @@ fi CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib" -AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) +AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample src/Makefile doc/Makefile doc/design-paper/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) AC_OUTPUT if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then -- cgit v1.2.3