<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
<META NAME="GENERATOR" CONTENT="GtkHTML/3.26.0">
</HEAD>
<BODY>
On Thu, 2010-03-04 at 15:42 -0300, Fernando Carrijo wrote:
<BLOCKQUOTE TYPE=CITE>
<PRE>
Hi Dan,
Dan Nicholson <<A HREF="mailto:dbn.lists@gmail.com">dbn.lists@gmail.com</A>> wrote:
> Adds an optional parameter to XORG_CHECK_ASCIIDOC to enforce a minimum
> version needed.
>
> Signed-off-by: Dan Nicholson <<A HREF="mailto:dbn.lists@gmail.com">dbn.lists@gmail.com</A>>
> ---
> xorg-macros.m4.in | 16 +++++++++++++++-
> 1 files changed, 15 insertions(+), 1 deletions(-)
>
> diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
> index 478e5fe..e9eecf2 100644
> --- a/xorg-macros.m4.in
> +++ b/xorg-macros.m4.in
> @@ -355,7 +355,7 @@ fi
> AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
> ]) # XORG_CHECK_XMLTO
>
> -# XORG_WITH_ASCIIDOC
> +# XORG_WITH_ASCIIDOC([MIN-VERSION])
> # ----------------
> # Minimum version: 1.5.0
> #
> @@ -403,6 +403,20 @@ elif test "x$use_asciidoc" = x"no" ; then
> else
> AC_MSG_ERROR([--with-asciidoc expects 'yes' or 'no'])
> fi
> +m4_ifval([$1],
> +[if test "$have_asciidoc" = yes; then
> + # scrape the asciidoc version
> + AC_MSG_CHECKING([the asciidoc version])
> + asciidoc_version=`$ASCIIDOC --version 2>/dev/null | cut -d' ' -f2`
> + AC_MSG_RESULT([$asciidoc_version])
> + AS_VERSION_COMPARE([$asciidoc_version], [$1],
> + [if test "x$use_asciidoc" = xauto; then
> + AC_MSG_WARN([asciidoc version $asciidoc_version found, but $1 needed])
> + have_asciidoc=no
> + else
> + AC_MSG_ERROR([asciidoc version $asciidoc_version found, but $1 needed])
> + fi])
> +fi])
> AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
> ]) # XORG_CHECK_ASCIIDOC
>
> --
> 1.6.6.1
>
I applied your first patch and rebuilt both xorg-macros and libXi using
build.sh, and even so something goes wrong. I'm not sure which version(s)
of asciidoc Gaetan tested against, but here with Ubuntu 9.10 and asciidoc
8.4.4 the the compilation keeps failing with error messages I can not
decypher.
Maybe if I post the steps I followed and the offending output lines you
can tell if the cause of the failure is my own lack of expertise, or
something else. So here they go
</PRE>
</BLOCKQUOTE>
<BR>
<BLOCKQUOTE TYPE=CITE>
<PRE>
First my steps:
$ cd $UTIL_MACROS_DIR
$ git apply dans-asciidoc-related-patch.diff
$ sudo make distclean
$ cd $LIB_LIBXI_DIR
$ sudo make distclean
$ cd $XORG_DIR
$ sudo util/modular/build.sh -o util/macros /opt/xorg
$ sudo util/modular/build.sh -o lib/libXi /opt/xorg
And then the output of building libXi:
<A HREF="http://pastebin.com/3NK6yw9L">http://pastebin.com/3NK6yw9L</A>
If there's anything else I can do, please let me know.
</PRE>
</BLOCKQUOTE>
You need 8.5.1 or later. I have Ubuntu as well and I updated from <A HREF="http://packages.debian.org/squeeze/asciidoc">http://packages.debian.org/squeeze/asciidoc</A><BR>
<BR>
<BLOCKQUOTE>
<PRE>
Package: asciidoc
State: installed
Automatically installed: no
Version: 8.5.1-1
Priority: optional
Section: text
Maintainer: Fredrik Steen <<A HREF="mailto:stone@debian.org">stone@debian.org</A>>
Uncompressed Size: 4678k
Depends: python (>= 2.3)
</PRE>
</BLOCKQUOTE>
<BR>
The patch is to allow for a version test so the build does not break if the tool is not recent enough. There is companion patch I assume is coming in libXi with something like XORG_WITH_ASCIIDOC(8.5.1)<BR>
<BR>
<BR>
<BLOCKQUOTE TYPE=CITE>
<PRE>
_______________________________________________
xorg-devel mailing list
<A HREF="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</A>
<A HREF="http://lists.x.org/mailman/listinfo/xorg-devel">http://lists.x.org/mailman/listinfo/xorg-devel</A>
</PRE>
</BLOCKQUOTE>
</BODY>
</HTML>