diff options
| author | Mukund Sivaraman <muks@banu.com> | 2009-11-14 16:34:06 +0530 |
|---|---|---|
| committer | Mukund Sivaraman <muks@banu.com> | 2009-11-14 16:34:06 +0530 |
| commit | c42fbaaf80a064bad17abd4bcb7c9422fe845eb4 (patch) | |
| tree | 7d674b2182c4b7135e94e6db9379ef55f67dcfbd | |
| parent | 2061a18313de8dce0efb5ecd326bcd5c04708711 (diff) | |
| download | tinyproxy-c42fbaaf80a064bad17abd4bcb7c9422fe845eb4.tar.gz tinyproxy-c42fbaaf80a064bad17abd4bcb7c9422fe845eb4.zip | |
Make asciidoc a requirement for building Tinyproxy
asciidoc is necessary as the version number is added during
configure into the asciidoc manpage sources. So simply bundling
a pre-generated manpage won't do.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | docs/man5/Makefile.am | 3 | ||||
| -rw-r--r-- | docs/man8/Makefile.am | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 74bba14..6fd041e 100644 --- a/configure.ac +++ b/configure.ac @@ -279,6 +279,9 @@ AC_SUBST(ADDITIONAL_OBJECTS) # Check for asciidoc AC_PATH_PROG(A2X, a2x, no) AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") +if test x"$A2X" = x"no"; then + AC_MSG_ERROR([Test for asciidoc failed. See the file 'INSTALL' for help.]) +fi AC_CONFIG_FILES([ Makefile diff --git a/docs/man5/Makefile.am b/docs/man5/Makefile.am index 95f3833..8143932 100644 --- a/docs/man5/Makefile.am +++ b/docs/man5/Makefile.am @@ -15,9 +15,6 @@ else @echo "*** a2x (asciidoc) is required to regenerate $(@) ***"; exit 1; endif -EXTRA_DIST = \ - $(man_MANS) - CLEANFILES = \ $(MAN5_FILES:.txt=.5) \ $(MAN5_FILES:.txt=.xml) diff --git a/docs/man8/Makefile.am b/docs/man8/Makefile.am index 0bd9ea6..ba38f3a 100644 --- a/docs/man8/Makefile.am +++ b/docs/man8/Makefile.am @@ -15,9 +15,6 @@ else @echo "*** a2x (asciidoc) is required to regenerate $(@) ***"; exit 1; endif -EXTRA_DIST = \ - $(man_MANS) - CLEANFILES = \ $(MAN8_FILES:.txt=.8) \ $(MAN8_FILES:.txt=.xml) |