Hi and best wishes for 2010, There are duplicated checks for xmlto in more and more X.Org packages. I've 2 problems with that:
- the 1st one is just code duplication - the 2nd one is that the code currently used doesn't allow to ignore an installed xmlto package. I want this because the base OpenBSD system doen't have xmlto (and other systems also don't have it) yet I want to have consistant X builds, wether or not xmlto is installed as a 3rd party package. So I'm proposing to add a generic test to xorg-macros.m4 and replace the 3 lines that are found in app/xfs, lib/libXcomposite, lib/libXfont, lib/libXi and lib/libXtst by XORG_WITH_XMLTO: like this: --- a/configure.ac +++ b/configure.ac @@ -46,9 +46,7 @@ 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"]) +XORG_WITH_XMLTO AC_CHECK_HEADERS([stdint.h]) >From 05a9995d9679a72948d56c3bbae7b3ed04374c57 Mon Sep 17 00:00:00 2001 >From: Matthieu Herrb <[email protected]> Date: Sun, 3 Jan 2010 18:04:25 +0100 Subject: [utils/macros] Add XORG_WITH_XMLTO to factorize xmlto tests. This also allow to configure with --without-xmlto to ignore a 3rd party xmlto tool on systems that normally don't have it, in order to have reproducable builds. Signed-off-by: Matthieu Herrb <[email protected]> --- xorg-macros.m4.in | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index 20d0c70..614f649 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -310,6 +310,32 @@ AC_SUBST(MAKE_PDF) AC_SUBST(MAKE_HTML) ]) # XORG_CHECK_DOCBOOK +# XORG_CHECK_XMLTO +# ---------------- +# Minimum version: 1.4.2 +# +# xmlto checks +AC_DEFUN([XORG_WITH_XMLTO],[ +AC_ARG_VAR([XMLTO], [Path to xmlto command]) +AC_ARG_WITH(xmlto, + AS_HELP_STRING([--with-xmlto], + [Use xmlto to regenerate documentation (default: auto)]), + [use_xmlto=$withval], [use_xmlto=auto]) + +if ! test "x$use_xmlto" = x"no" ; then + AC_PATH_PROG([XMLTO], [xmlto]) + if test "x$XMLTO" = "x" -a ! -f $srcdir/man/Xcomposite.man ; then + AC_MSG_WARN([xmlto not found - cannot create man pages without it]) + fi +else + if ! test "x$XMLTO" = "x"; then + AC_MSG_WARN([ignoring XMLTO environment variable since --with-xmlto=no was specified]) + unset XMLTO + fi +fi +AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"]) +]) # XORG_CHECK_XMLTO + # XORG_CHECK_MALLOC_ZERO # ---------------------- # Minimum version: 1.0.0 -- 1.6.5.3 -- Matthieu Herrb _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
