diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2010-01-26 09:17:12 -0800 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2010-01-26 14:07:13 -0800 |
| commit | b75b8fa4bda0fb18872fa82a04fe7f609a147f8b (patch) | |
| tree | 6c2cb4d7765b6ac0763c0e171ebe2ddd6ea9527f | |
| parent | f10f6f2fd420786cddac875d1b6de2004ba8c9d4 (diff) | |
Need both xmlto and asciidoc to install man pages from a checkout
The check for whether to build the pages looked for both xmlto and
asciidoc, but the check to install didn't. Refactor a bit so that the
check is done only once.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
Tested-by: Christian Hartmann <cornogle@googlemail.com>
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 68983c2..f8ef5e9 100644 --- a/configure.ac +++ b/configure.ac @@ -26,18 +26,24 @@ XI_CFLAGS="$CWARNFLAGS $XI_CFLAGS" AC_SUBST(XI_CFLAGS) AC_SUBST(XI_LIBS) -# Determine if the source for man pages is available -# It may already be present (tarball) or can be generated using xmlto -AM_CONDITIONAL([INSTALL_MANPAGES], - [test -f "$srcdir/man/XAllowDeviceEvents.man" || test "x$have_xmlto" = xyes]) - # Check for xmlto and asciidoc for man page conversion # (only needed by people building tarballs) -AM_CONDITIONAL([HAVE_DOCTOOLS], [test "x$XMLTO" != "x" && test "x$ASCIIDOC" != "x"]) -if test "x$XMLTO" = "x" || test "x$ASCIIDOC" = "x"; then +if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then + have_doctools=yes +else + have_doctools=no +fi +AM_CONDITIONAL([HAVE_DOCTOOLS], [test $have_doctools = yes]) +if test $have_doctools = no; then AC_MSG_WARN([xmlto or asciidoc not found - cannot create man pages without it]) fi +# Determine if the source for man pages is available +# It may already be present (tarball) or can be generated using doctools +AM_CONDITIONAL([INSTALL_MANPAGES], + [test -f "$srcdir/man/XAllowDeviceEvents.man" || \ + test $have_doctools = yes]) + XORG_CHECK_MALLOC_ZERO AC_OUTPUT([Makefile |