[PATCH libXtst] config: replace custom code with reusable macro XORG_WITH_XMLTO

Gaetan Nadon memsize at videotron.ca
Wed Jan 20 08:05:57 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 4b136d6..2c898e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,21 +29,16 @@ 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
 AM_CONFIG_HEADER(config.h)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
-# Check for xmlto for man page conversion 
-# (only needed by people building tarballs)
-AC_ARG_VAR([XMLTO], [Path to xmlto command])
-AC_PATH_PROG([XMLTO], [xmlto])
-AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
-
 # Check for dependencies
 PKG_CHECK_MODULES(XTST, x11 [xext >= 1.0.99.4] xi [recordproto >= 1.13.99.1] [xextproto >= 7.0.99.3] inputproto)
 XTST_CFLAGS="$CWARNFLAGS $XTST_CFLAGS"
-- 
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