[PATCH macros 1/2] doc: Specify minimum asciidoc version to XORG_CHECK_ASCIIDOC

[Dan Nicholson]

On Thu, Mar 4, 2010 at 10:42 AM, Fernando Carrijo <fcarrijo at yahoo.com.br> wrote:
> Hi Dan,
>
> Dan Nicholson <dbn.lists at gmail.com> wrote:
>> Adds an optional parameter to XORG_CHECK_ASCIIDOC to enforce a minimum
>> version needed.
>>
>> Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
>> ---
>>  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.

We need to change libXi to demand 8.4.5. I think the big reason for
needing this change is the Ubuntu has 8.4.4 and it doesn't work. So,
change libXi to:

XORG_CHECK_ASCIIDOC([8.4.5])

You should have the doc build skipped in that case. But for the error
you're hitting,

make[1]: *** No rule to make target
`XChangeDeviceDontPropagateList.3', needed by `all-am'.  Stop.

I think it's something we fixed in the libXi automake rules a while
back. Is this libXi git?

--
Dan