libXfont: Changes to 'master'

[Gaetan Nadon]

On Wed, 2010-03-31 at 15:12 -0700, Dan Nicholson wrote:

> On Wed, Mar 31, 2010 at 2:46 PM, Jeremy Huddleston
> <jeremyhu at freedesktop.org> wrote:
> > This introduced a regression on tinderbox:
> >
> > http://tinderbox.x.org/builds/2010-03-31-0030/logs/libXfont
> >
> >
> > On Mar 30, 2010, at 10:19, Gaetan Nadon wrote:
> >
> >> Makefile.am  |    3 +--
> >> configure.ac |    4 ++--
> >> 2 files changed, 3 insertions(+), 4 deletions(-)
> >>
> >> New commits:
> >> commit 8e84687b26be6e8f5da4fce173c0a134eb07f4f3
> >> Author: Gaetan Nadon <memsize at videotron.ca>
> >> Date:   Tue Mar 30 09:26:13 2010 -0400
> >>
> >>    config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
> >>
> >>    Both headers end up created by the same macro.
> >>
> >>    Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
> >>    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> 
> Oops, there's a couple issues with that patch.
> 
> 1. AC_CONFIG_HEADERS does not appear to make the config.h.in template
> for you when there are multiple files passed to it. Separating it to
> two calls to AC_CONFIG_HEADERS seems to do the trick.
> 

It creates a file "config.h\n.in". Because the old one was not removed
(even with distclean),
The problem was unnoticed for me. It does not like filename separated by
a new line.

> 2. include/X11/fonts/fontconf.h.in was dropped from EXTRA_DIST. We
> need this template to be distributed since otherwise it will look just
> like config.h.in when building from a tarball. And then you'll pollute
> a system header with stuff like #define IPv6 1.
> 

It is included in the tarball, at least for me. AC_CONFIG_HEADERS is an
instantiating macro,
just like AC_OUTPUT. I'll try some more.

> This should probably just be reverted for now until it gets straightened out.
> 

Done. 
Revert should be in the 03:00 build.

Sorry for the problem.


Macro: AC_CONFIG_HEADERS (header ..., [cmds], [init-cmds])
        
        This macro is one of the instantiating macros; see Configuration
        Actions. Make AC_OUTPUT create the file(s) in the
        blank-or-newline-separated list header containing C preprocessor
        #define statements, and replace ‘@DEFS@’ in generated files with
        -DHAVE_CONFIG_H instead of the value of DEFS. The usual name for
        header is config.h. 
        

I am on autoconf 2.60 and automake 1.9.6.


> --
> Dan
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20100331/a60e9e7d/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/20100331/a60e9e7d/attachment.pgp>