<!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 14:38 -0500, Gaetan Nadon wrote: <BLOCKQUOTE TYPE=CITE> On Thu, 2010-03-04 at 10:55 -0800, Dan Nicholson wrote: <BLOCKQUOTE TYPE=CITE> <PRE> On Thu, Mar 4, 2010 at 10:42 AM, Fernando Carrijo <<A HREF="mailto:fcarrijo@yahoo.com.br">fcarrijo@yahoo.com.br</A>> wrote: > 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. 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]) </PRE> </BLOCKQUOTE> So, you just bumped the number by one to fix the build, not knowing if 8.4.5 works? I know for sure 8.5.1 (on Ubuntu) works, but there might be an earlier version that does. There are 8.4.5 and 8.5.0 in between. <A HREF="http://sourceforge.net/projects/asciidoc/files/">http://sourceforge.net/projects/asciidoc/files/</A> </BLOCKQUOTE> Julien said 8.4.5 works: <A HREF="https://bugs.freedesktop.org/show_bug.cgi?id=24289#c3">https://bugs.freedesktop.org/show_bug.cgi?id=24289#c3</A> <BLOCKQUOTE TYPE=CITE> <BLOCKQUOTE TYPE=CITE> <PRE> 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 _______________________________________________ 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> <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>