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

[Gaetan Nadon]

On Thu, 2010-03-04 at 16:21 -0500, Gaetan Nadon wrote:

> On Thu, 2010-03-04 at 12:36 -0800, Dan Nicholson wrote: 
> 
> > On Thu, Mar 4, 2010 at 12:10 PM, Fernando Carrijo <fcarrijo at yahoo.com.br> wrote:
> > > Dan Nicholson <dbn.lists at gmail.com> wrote:
> > >> 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,
> > >
> > > I forgot to mention that in another trial I added a line exactly like
> > > this one you suggested above to lib/libXi/configure.ac, then removing
> > > the one which imediatelly preceded it, after presuming that both were
> > > mutually exclusive. This rendered the following diff:
> > >
> > >  @@ -12,7 +12,7 @@ m4_ifndef([XORG_MACROS_VERSION],
> > >   XORG_MACROS_VERSION(1.5)
> > >   XORG_DEFAULT_OPTIONS
> > >   XORG_WITH_XMLTO
> > >  -XORG_WITH_ASCIIDOC
> > >  +XORG_CHECK_ASCIIDOC([8.4.5])
> > >   AM_CONFIG_HEADER(src/config.h)
> > >
> > >   # Check for progs
> > >
> > > and resulted in this (abridged) output:
> > >
> > >  checking for xmlto... /usr/bin/xmlto
> > >  ./configure: line 4889: syntax error near unexpected token `8.4.5'
> > >  ./configure: line 4889: `XORG_CHECK_ASCIIDOC(8.4.5)'
> > >
> > > That reminded me that in this same thread Gaetan suggested the use of
> > > XORG_WITH_ASCIIDOC([8.4.5]) instead. And after another round of 'make
> > > distclean' and 'build.sh' I got back to the situation I faced yesterday:
> > >
> > >  Making all in man
> > >  make[1]: Entering directory `/home/fcarrijo/softwares/repositorio/xorg/lib/libXi/man'
> > >  /bin/sed -e 's/__xorgversion__/"libXi 1.3" "X Version 11"/' -e 's/__xservername__/Xorg/g' -e 's/__xconfigfile__/xorg.conf/g' -e 's/__appmansuffix__/1/g' -e 's/libmansuffix/3/g' -e 's/__filemansuffix__/5/g' < XAllowDeviceEvents.man > XAllowDeviceEvents.3
> > >  make[1]: *** No rule to make target `XChangeDeviceDontPropagateList.3', needed by `all-am'.  Stop.
> > >  make[1]: Leaving directory `/home/fcarrijo/softwares/repositorio/xorg/lib/libXi/man'
> > >  make: *** [all-recursive] Error 1
> > >
> > > Something tells me that the one-liner comment which follows the
> > > implementation of the macro XORG_WITH_ASCIIDOC, in xorg-macros.m4 is, in
> > > the absence of a better word, misleading. But with the knowledge I have
> > > now about the inner workings of the autotools I dare not to infer much
> > > more.
> > >
> > >> 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?
> > >
> > > Yes. HEAD revision of master branch, as of today.
> > 
> > Hmm, it seems like it's actually still trying to build the pages
> > despite not having the tools. Can you tell me what "grep -e
> > HAVE_DOCTOOLS -e INSTALL_MANPAGES config.status" gives? What happens
> > if you do a full "git clean -Xdf" and then start again? It seems like
> > this would only be happening with stale files.
> > 
> > --
> > Dan
> 
> 
> I have a theory. Removing the .man files should clear the problem.
> This can be done by running make maintainer-clean as well.
> 
> The 2 step process. Convert .txt to .man using asciidoc and
> convert .man to .3 using sed. If asciidoc is disabled but if you
> have .man, then sed is invoked to create .3 files. In this case,
> the .man files are probably present but broken due to earlier run with
> asciidoc at the wrong level. They are are not removed by "clean", only
> by maintainer-clean. We have not tested with broken .man files.
> 
> 

This test is done at configure time, so if this file is removed
afterwards, or if other .man are missing, the makefile will try to
generated .3 from .man.

        # Determine if the source for man pages is available
        # It may already be present (tarball) or can be generated using doctools
        AM_CONDITIONAL([INSTALL_MANPAGES],
        	[test -f "$srcdir/man/XAllowDeviceEvents.man" || \
        	  test $have_doctools = yes])

Running make maintainer-clean and ./autogen.sh should restore the build
in a consistent state.


> 
> 
> 
> 
> 
> > _______________________________________________
> > xorg-devel mailing list
> > xorg-devel at lists.x.org
> > http://lists.x.org/mailman/listinfo/xorg-devel
> 
> _______________________________________________
> xorg-devel mailing list
> xorg-devel at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20100304/44a28939/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20100304/44a28939/attachment-0001.pgp>