qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge from upstream X.Org: use the AC_WITH_XMLTO and AC_WITH_ASCIIDOC

Browse Source 
macros from xorg-macros 1.5 to check for xmlto and asciidoc and
explicitely disable them in Makefile.bsd-wrapper.
Problem noticed by espie@.
This commit is contained in:
matthieu 2010-05-21 19:13:11 +00:00
parent 50794663dd
commit 0f15c7c5e7
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libXi/Makefile.bsd-wrapper
View File

@ -1,5 +1,8 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2010/05/18 19:28:54 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2010/05/21 19:13:11 matthieu Exp $
SHARED_LIBS= Xi 11.0
CONFIGURE_ARGS+= --without-xmlto --without-asciidoc
.include <bsd.xorg.mk>

12
lib/libXi/configure.ac
View File

@ -7,15 +7,17 @@ AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.5 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.5)
XORG_DEFAULT_OPTIONS
XORG_WITH_XMLTO
XORG_WITH_ASCIIDOC
AM_CONFIG_HEADER(src/config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
AC_PROG_SED
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.2.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 1.9.99.902])
@ -25,10 +27,6 @@ AC_SUBST(XI_LIBS)
# Check for xmlto and asciidoc for man page conversion
# (only needed by people building tarballs)
AC_ARG_VAR([XMLTO], [Path to xmlto command])
AC_PATH_PROG([XMLTO], [xmlto])
AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
AC_PATH_PROG([ASCIIDOC], [asciidoc])
AM_CONDITIONAL([HAVE_DOCTOOLS], [test "x$XMLTO" != "x" && test "x$ASCIIDOC" != "x"])
if test "x$XMLTO" = "x" || test "x$ASCIIDOC" = "x"; then
AC_MSG_WARN([xmlto or asciidoc not found - cannot create man pages without it])