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