6 files changed, 24 insertions, 14 deletions
diff --git a/lib/libXcomposite/Makefile.bsd-wrapper b/lib/libXcomposite/Makefile.bsd-wrapper
index c87b4741b..c3826e777 100644
--- a/lib/libXcomposite/Makefile.bsd-wrapper
+++ b/lib/libXcomposite/Makefile.bsd-wrapper
@@ -1,5 +1,7 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2007/03/15 23:00:47 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2010/01/17 20:48:49 matthieu Exp $
 
 SHARED_LIBS=	Xcomposite 3.0
 
+CONFIGURE_ARGS +=	--with-xmlto=no
+
 .include <bsd.xorg.mk>
diff --git a/lib/libXcomposite/configure.ac b/lib/libXcomposite/configure.ac
index 3567715b4..154cd2cc4 100644
--- a/lib/libXcomposite/configure.ac
+++ b/lib/libXcomposite/configure.ac
@@ -48,12 +48,7 @@ AC_PROG_LIBTOOL
 
 XORG_DEFAULT_OPTIONS
 
-AC_ARG_VAR([XMLTO], [Path to xmlto command])
-AC_PATH_PROG([XMLTO], [xmlto])
-AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
-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
+XORG_WITH_XMLTO
 
 # Check compositeext configuration, strip extra digits from package version to
 # find the required protocol version
diff --git a/lib/libXfont/Makefile.bsd-wrapper b/lib/libXfont/Makefile.bsd-wrapper
index 047c78ee9..c3c373849 100644
--- a/lib/libXfont/Makefile.bsd-wrapper
+++ b/lib/libXfont/Makefile.bsd-wrapper
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.9 2009/10/31 17:57:11 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2010/01/17 20:48:49 matthieu Exp $
 .include <bsd.xconf.mk>
 
 SHARED_LIBS=	Xfont 9.0
 
+CONFIGURE_ARGS+= --with-xmlto=no
+
 .if ${XENOCARA_HAVE_SHARED_LIBS:L} == "no"
 CONFIGURE_ARGS+= --disable-loadable-font-modules
 .endif
diff --git a/lib/libXfont/configure.ac b/lib/libXfont/configure.ac
index 399f7d05d..cc75baeb5 100644
--- a/lib/libXfont/configure.ac
+++ b/lib/libXfont/configure.ac
@@ -50,9 +50,7 @@ PKG_PROG_PKG_CONFIG
 XORG_DEFAULT_OPTIONS
 
 # 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"])
+XORG_WITH_XMLTO
 
 # Option to enable support for building developer internals docs
 AC_ARG_ENABLE(devel-docs,
diff --git a/lib/libXtst/Makefile.bsd-wrapper b/lib/libXtst/Makefile.bsd-wrapper
index 3fa2138b0..594b66d13 100644
--- a/lib/libXtst/Makefile.bsd-wrapper
+++ b/lib/libXtst/Makefile.bsd-wrapper
@@ -1,5 +1,7 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2007/03/15 23:00:48 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2010/01/17 20:48:49 matthieu Exp $
 
 SHARED_LIBS=	Xtst 10.0
 
+CONFIGURE_ARGS=	--without-xmlto
+
 .include <bsd.xorg.mk>
diff --git a/lib/libXtst/configure.ac b/lib/libXtst/configure.ac
index a7fc7aed1..617f80da5 100644
--- a/lib/libXtst/configure.ac
+++ b/lib/libXtst/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
 
-AC_INIT(libXtst, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXtst)
+AC_INIT(libXtst, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXtst)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
@@ -33,14 +33,25 @@ AM_CONFIG_HEADER(config.h)
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
+# Check for xmlto for man page conversion 
+# (only needed by people building tarballs)
+XORG_WITH_XMLTO
+
 # Check for dependencies
 PKG_CHECK_MODULES(XTST, x11 xext recordproto xextproto inputproto)
 
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+XORG_LINT_LIBRARY([Xtst])
+LINT_FLAGS="${LINT_FLAGS} ${XTST_CFLAGS}"
+
 AC_SUBST(XTST_CFLAGS)
 AC_SUBST(XTST_LIBS)
-		  
+
+XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
 AC_OUTPUT([Makefile
+	   man/Makefile
 	   src/Makefile
            xtst.pc])