[Xcb] [PATCH] htmldir was introduced in autoconf 2.59c: set a reasonable value for earlier versions.

[Vincent Torri]

Except that I can't build xcb because I've some modifications in the randr 
protocol description, it works :)

You can commit it :)

Btw, can someone give me a link to the latest randr protocol 
specification, please ? Maybe the link I gave in my patch (see bugzilla) 
is not the latest.

Vincent

On Sun, 19 Nov 2006, Jamey Sharp wrote:

> ---
>
> On Sun, Nov 19, 2006 at 07:47:40AM +0100, Vincent Torri wrote:
>> On my system, htmldir is empty. That's why I did that
>
> On Sun, Nov 19, 2006 at 08:19:40AM +0100, Vincent Torri wrote:
>> doc/Makefile.am:8: `html_DATA' is used but `htmldir' is undefined
>
> Ah. docdir and htmldir were added to autoconf CVS in January 2005, but
> didn't appear in a release until autoconf 2.59c, released April 2006. So
> you need a version at least that new to use them.
>
> However, your definition of htmldir breaks on current autoconf, because
> at the time it's expanded, prefix is (by default) set to "NONE". It
> doesn't get reset to the right default until later.
>
> I want to use autoconf's definition of htmldir if available, but that's
> not a very good reason to make a seven-month old release a hard
> requirement. So does this patch work for you?
>
> --Jamey
>
>
> configure.ac |    6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 2846184..a831f34 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -114,6 +114,12 @@ AC_SUBST(CWARNFLAGS)
>
> GCC_CHECK_VISIBILITY()
>
> +# htmldir is not defined prior to autoconf 2.59c, so on earlier versions
> +# set an equivalent value.
> +AC_PREREQ([2.59c], [], [AC_SUBST([htmldir], [m4_ifset([AC_PACKAGE_TARNAME],
> +	  ['${datadir}/doc/${PACKAGE_TARNAME}'],
> +	  ['${datadir}/doc/${PACKAGE}'])
> +])])
> AM_CHECK_DOXYGEN()
>
> AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile doc/Makefile])
> -- 
> 1.4.3.3
>
> _______________________________________________
> Xcb mailing list
> Xcb at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/xcb
>
> -- 
> Ce message a été vérifié par MailScanner
> pour des virus ou des polluriels et rien de
> suspect n'a été trouvé.
> Message délivré par le serveur de messagerie de l'Université d'Evry.
>
>