libXfont: Changes to 'master'

[Dan Nicholson]

On Wed, Mar 31, 2010 at 6:10 PM, Gaetan Nadon <memsize at videotron.ca> wrote:
> 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.

Oh, I had that file when I tested now, but I didn't realize that's why
it happened. So, if we just change it to not having the files on
separate lines, we'll be OK?

AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h])

> 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.

Ah, of course. Forget what I said there. Can you mention that it's
already included in the commit message?

--
Dan