[PATCH libXfont 1/2] config: replace custom code with reusable macro XORG_WITH_XMLTO

Gaetan Nadon memsize at videotron.ca
Wed Jan 20 08:59:17 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 |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 66758a6..6e39c1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,9 +39,10 @@ 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
 
 # Check for progs
 AC_PROG_CC
@@ -50,12 +51,6 @@ dnl If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config
 dnl must first be located explicitly.
 PKG_PROG_PKG_CONFIG
 
-
-# xmlto is used to convert doc/fontlib.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"])
-
 # Option to enable support for building developer internals docs
 AC_ARG_ENABLE(devel-docs,
 	AS_HELP_STRING([--enable-devel-docs],
-- 
1.6.0.4

Initial post for review
util-macros 1.5.0 has been released
There is no maintainer on record for this module


More information about the xorg-devel mailing list