diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-01-17 20:48:50 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-01-17 20:48:50 +0000 |
| commit | 5b3a8a44d884b9672261db44af5e73d13e22d1cd (patch) | |
| tree | d20ddf00550eb763e6fe228c2a090613c8097863 /app | |
| parent | b0b3bf8fdf974216ffed5b7768ea290f4cf5bbf2 (diff) | |
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.
Diffstat (limited to 'app')
| -rw-r--r-- | app/xfs/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | app/xfs/configure.ac | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/xfs/Makefile.bsd-wrapper b/app/xfs/Makefile.bsd-wrapper index 94c8df4d4..51563c4bf 100644 --- a/app/xfs/Makefile.bsd-wrapper +++ b/app/xfs/Makefile.bsd-wrapper @@ -1,5 +1,5 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2006/11/29 11:41:28 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2010/01/17 20:48:49 matthieu Exp $ -CONFIGURE_ARGS= --datadir=/etc +CONFIGURE_ARGS= --datadir=/etc --with-xmlto=no .include <bsd.xorg.mk> diff --git a/app/xfs/configure.ac b/app/xfs/configure.ac index dc7559c48..74ac6c85f 100644 --- a/app/xfs/configure.ac +++ b/app/xfs/configure.ac @@ -44,9 +44,7 @@ AC_PROG_INSTALL AC_CANONICAL_HOST # 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]) |