[PATCH xserver] doc: specify 1.6.1 as the minimum version for doxygen.

Jeremy Huddleston jeremyhu at apple.com
Thu Apr 1 13:12:36 PDT 2010


Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

On Apr 1, 2010, at 12:53, Gaetan Nadon wrote:

> Older versions generate filenames that are different from
> the ones listed in the Makefile.
> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
> configure.ac |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 5f08688..bee6563 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -34,10 +34,10 @@ AM_MAINTAINER_MODE
> 
> # Require xorg-macros: XORG_DEFAULT_OPTIONS
> m4_ifndef([XORG_MACROS_VERSION],
> -          [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])])
> -XORG_MACROS_VERSION(1.5)
> +          [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])])
> +XORG_MACROS_VERSION(1.6)
> XORG_DEFAULT_OPTIONS
> -XORG_WITH_DOXYGEN
> +XORG_WITH_DOXYGEN(1.6.1)
> 
> m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])])
> XORG_FONT_MACROS_VERSION(1.1)
> -- 
> 1.6.0.4
> 
> Resending for review (4th time)
> 
> This gives additional protection against doc generation failure
> that are hard to diagnose when the tool is at a lower level.
> 
> This patch makes use of the version checking feature added in util-macros
> 
> http://cgit.freedesktop.org/xorg/util/macros/commit/?id=2c833326fdd83039999b5563eb9f621ff57e3bf5
> doc: Specify minimum xmlto version to XORG_WITH_DOXYGEN
> Adds an optional parameter to XORG_WITH_DOXYGEN to enforce a minimum version
> needed like the asciidoc version check. 
> Reviewed-by: Dan Nicholson <dbn.lists at gmail.com> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> 
> 
> 
> 
> 
> 
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel



More information about the xorg-devel mailing list