Hi, I have tested this patch in the default mode, which works for me now.
Thanksb. Christian H. 2010/1/26 Gaetan Nadon <[email protected]>: > On Tue, 2010-01-26 at 09:29 -0800, Dan Nicholson wrote: > > On Tue, Jan 26, 2010 at 04:01:42PM +0100, Christian Hartmann wrote: >> Hello Dan, >> >> I have cloned again in a new directory and after a configure I see: >> >> checking for XI... yes >> configure: WARNING: xmlto or asciidoc not found - cannot create man >> pages without it >> checking whether malloc(0) returns NULL... yes >> configure: creating ./config.status >> config.status: creating Makefile >> config.status: creating src/Makefile >> config.status: creating man/Makefile >> config.status: creating xi.pc >> config.status: creating src/config.h >> config.status: executing depfiles commands >> config.status: executing libtool commands >> >> I have xmlto installed: >> ch...@oddysseus:~/linux_2.6/Xorg.git/libXi$ which xmlto >> /usr/bin/xmlto >> ch...@oddysseus:~/linux_2.6/Xorg.git/libXi$ /usr/bin/xmlto --version >> xmlto version 0.0.23 >> >> On my other machine - AMD x86_64 - I got the same issue after git pull >> (the commit in question) and the same error message again. >> >> I have exported these variables: >> export PKG_CONFIG_PATH=/opt/xorg/lib/pkgconfig >> export LDFLAGS=-L/opt/xorg/lib >> export CPPFLAGS=-I/opt/xorg/include >> export ACLOCAL="/usr/bin/aclocal -I /opt/xorg/share/aclocal" >> >> For each xserver component I pulled from git I do a ./autogen >> --prefix=/opt/xorg && make && sudo make install. But with the last >> commit, also after a fresh cloning, I am not able to compile errorfree >> >> The AMD machine compiled errorfree, there is no problem with the >> manpages. Only after the alst commit, it hangs there. I can workaround >> it, but this is only a temporary solution for me ;) > > OK, the problem is actually in the previous commit. We only check for > xmlto when determining if installing is OK, even though we also need > asciidoc. Can you try the patch below? > > -- > Dan > > >From 2ef6fcc7506b8a0f283dc4c00e6e6e17196db319 Mon Sep 17 00:00:00 2001 > From: Dan Nicholson <[email protected]> > Date: Tue, 26 Jan 2010 09:17:12 -0800 > Subject: [PATCH] Need both xmlto and asciidoc to install man pages from a > checkout > > The check for whether to build the pages looked for both xmlto and > asciidoc, but the check to install didn't. Refactor a bit so that the > check is done only once. > > Signed-off-by: Dan Nicholson <[email protected]> > --- > configure.ac | 20 +++++++++++++------- > 1 files changed, 13 insertions(+), 7 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 68983c2..f8ef5e9 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -26,18 +26,24 @@ XI_CFLAGS="$CWARNFLAGS $XI_CFLAGS" > AC_SUBST(XI_CFLAGS) > AC_SUBST(XI_LIBS) > > -# Determine if the source for man pages is available > -# It may already be present (tarball) or can be generated using xmlto > -AM_CONDITIONAL([INSTALL_MANPAGES], > - [test -f "$srcdir/man/XAllowDeviceEvents.man" || test "x$have_xmlto" = > xyes]) > - > # Check for xmlto and asciidoc for man page conversion > # (only needed by people building tarballs) > -AM_CONDITIONAL([HAVE_DOCTOOLS], [test "x$XMLTO" != "x" && test "x$ASCIIDOC" > != "x"]) > -if test "x$XMLTO" = "x" || test "x$ASCIIDOC" = "x"; then > +if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then > + have_doctools=yes > +else > + have_doctools=no > +fi > +AM_CONDITIONAL([HAVE_DOCTOOLS], [test $have_doctools = yes]) > +if test $have_doctools = no; then > AC_MSG_WARN([xmlto or asciidoc not found - cannot create man pages > without > it]) > fi > > +# 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]) > + > XORG_CHECK_MALLOC_ZERO > > AC_OUTPUT([Makefile > > Tested-by: Gaetan Nadon <[email protected]> > Nice refactoring. > > I have re-tested all scenarios for git and tarball builds (including the > missing permutation this time) > > Thanks to Christian for reporting the problem. Note there are now configure > options available to control the usage of the doc tools: > > --with-xmlto Use xmlto to regenerate documentation (default: > yes, > if installed) > --with-asciidoc Use asciidoc to regenerate documentation (default: > yes, if installed) > > This may be very useful in case where the tool is there, but not at the > right level and breaks the build. > > -- -- ......oooO.............. .....(....).....Oooo... ......)../.....(....).... .....(_/.......)../..... ...............(_/....... ... I WAS .............. .......... HERE...... ;) _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
