Use the new XORG_WITH_XMLTO macro in configure scripts and explicitely

disable it during Xenocara builds. Problem reported by kili@ who also
tested this patch with an earlier version of the macro.
This commit is contained in:
matthieu
2010-01-17 20:48:49 +00:00
parent 74f33f0ef4
commit 2dda0f8061
9 changed files with 16 additions and 22 deletions

View File

@@ -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>

View File

@@ -35,9 +35,7 @@ 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"])
XORG_WITH_XMLTO
# Check for dependencies
PKG_CHECK_MODULES(XTST, x11 xext recordproto xextproto inputproto)