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 /lib/libXfont | |
| 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 'lib/libXfont')
| -rw-r--r-- | lib/libXfont/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | lib/libXfont/configure.ac | 4 |
2 files changed, 4 insertions, 4 deletions
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, |