diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-01-18 16:02:41 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-01-19 13:47:57 -0500 |
| commit | 213cf861e8a29c6f991828beb6656239206c9947 (patch) | |
| tree | 80796922959b9016eadd790c3cd0796e233cef83 | |
| parent | fa2155fa64cf7b43ee40064cb53b05388885c1dc (diff) | |
| download | xorg-lib-libXcomposite-213cf861e8a29c6f991828beb6656239206c9947.tar.gz | |
config: replace custom code with reusable macro XORG_WITH_XMLTO
XORG_WITH_XMLTO provides additional functions like a configure
option which allow platform builders to control the usage of
the xmlto program.
This is a requirement from platforms that do not have such doc tool.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 8722157..54ea754 100644 --- a/configure.ac +++ b/configure.ac @@ -36,10 +36,10 @@ AC_INIT(libXcomposite, 0.4.1, [https://bugs.freedesktop.org/enter_bug.cgi?produc AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.5) AM_CONFIG_HEADER(config.h) # Check for progs @@ -47,13 +47,7 @@ AC_PROG_CC AC_PROG_LIBTOOL XORG_DEFAULT_OPTIONS - -AC_ARG_VAR([XMLTO], [Path to xmlto command]) -AC_PATH_PROG([XMLTO], [xmlto]) -AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"]) -if test "x$XMLTO" = "x" -a ! -f $srcdir/man/Xcomposite.man ; then - AC_MSG_WARN([xmlto not found - cannot create man pages without it]) -fi +XORG_WITH_XMLTO # Check compositeext configuration, strip extra digits from package version to # find the required protocol version |