[PATCH app-xfs 1/2] config: replace custom code with reusable macro XORG_WITH_XMLTO

Gaetan Nadon memsize at videotron.ca
Fri Jan 22 06:34:42 PST 2010


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 <memsize at videotron.ca>
---
 configure.ac |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 00f5ab1..b429ed5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,10 +28,11 @@ AM_MAINTAINER_MODE
 # xfs already have a header called config.h
 AM_CONFIG_HEADER(xfs-config.h)
 
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# 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_WITH_XMLTO
 
 # Set common system defines for POSIX extensions, such as _GNU_SOURCE
 # Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
@@ -45,11 +46,6 @@ AC_CANONICAL_HOST
 
 XORG_DEFAULT_OPTIONS
 
-# xmlto is used to convert doc/design.xml from DocBook to PDF/HTML
-AC_ARG_VAR([XMLTO], [Path to xmlto command])
-AC_PATH_PROG([XMLTO], [xmlto])
-AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
-
 AC_CHECK_HEADERS([stdint.h])
 
 AC_ARG_WITH(default-config-file,
-- 
1.6.0.4

Revised series with pdf enabled


More information about the xorg-devel mailing list