From c94494c144c634b7fa3187c55458cafa0e06a69c Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Tue, 19 Jan 2010 13:44:49 -0500 Subject: config: replace custom code with reusable macro XORG_WITH_XMLTO XORG_WITH_XMLTO provides additional functions like a configure option which allow platform builders to control the usage of the xmlto program. This is a requirement from platforms that do not have such doc tool. Signed-off-by: Gaetan Nadon --- configure.ac | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index ede6363..347dcef 100644 --- a/configure.ac +++ b/configure.ac @@ -8,9 +8,11 @@ AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.5) XORG_DEFAULT_OPTIONS +XORG_WITH_XMLTO +XORG_WITH_ASCIIDOC AM_CONFIG_HEADER(src/config.h) # Check for progs @@ -26,10 +28,6 @@ AC_SUBST(XI_LIBS) # Check for xmlto and asciidoc for man page conversion # (only needed by people building tarballs) -AC_ARG_VAR([XMLTO], [Path to xmlto command]) -AC_PATH_PROG([XMLTO], [xmlto]) -AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) -AC_PATH_PROG([ASCIIDOC], [asciidoc]) AM_CONDITIONAL([HAVE_DOCTOOLS], [test "x$XMLTO" != "x" && test "x$ASCIIDOC" != "x"]) if test "x$XMLTO" = "x" || test "x$ASCIIDOC" = "x"; then AC_MSG_WARN([xmlto or asciidoc not found - cannot create man pages without it]) -- cgit v1.2.3