<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN"> <HTML> <HEAD> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8"> <META NAME="GENERATOR" CONTENT="GtkHTML/3.26.0"> </HEAD> <BODY> On Wed, 2010-03-31 at 15:12 -0700, Dan Nicholson wrote: <BLOCKQUOTE TYPE=CITE> <PRE> On Wed, Mar 31, 2010 at 2:46 PM, Jeremy Huddleston <<A HREF="mailto:jeremyhu@freedesktop.org">jeremyhu@freedesktop.org</A>> wrote: > This introduced a regression on tinderbox: > > <A HREF="http://tinderbox.x.org/builds/2010-03-31-0030/logs/libXfont">http://tinderbox.x.org/builds/2010-03-31-0030/logs/libXfont</A> > > > 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 <<A HREF="mailto:memsize@videotron.ca">memsize@videotron.ca</A>> >> 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 <<A HREF="mailto:dbn.lists@gmail.com">dbn.lists@gmail.com</A>> >>    Signed-off-by: Gaetan Nadon <<A HREF="mailto:memsize@videotron.ca">memsize@videotron.ca</A>> 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. </PRE> </BLOCKQUOTE> 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. <BLOCKQUOTE TYPE=CITE> <PRE> 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. </PRE> </BLOCKQUOTE> 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. <BLOCKQUOTE TYPE=CITE> <PRE> This should probably just be reverted for now until it gets straightened out. </PRE> </BLOCKQUOTE> Done. Revert should be in the 03:00 build. Sorry for the problem. Macro: AC_CONFIG_HEADERS (<TT>header </TT><TT>...</TT><TT>, </TT>[<TT>cmds</TT>]<TT>, </TT>[<TT>init-cmds</TT>]) <BLOCKQUOTE> This macro is one of the instantiating macros; see <A HREF="http://www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Actions">Configuration Actions</A>. Make <TT>AC_OUTPUT</TT> create the file(s) in the blank-or-newline-separated list <TT>header</TT> containing C preprocessor <TT>#define</TT> statements, and replace ‘@DEFS@’ in generated files with -DHAVE_CONFIG_H instead of the value of <TT>DEFS</TT>. The usual name for <TT>header</TT> is config.h. </BLOCKQUOTE> I am on autoconf 2.60 and automake 1.9.6. <BLOCKQUOTE TYPE=CITE> <PRE> -- Dan _______________________________________________ <A HREF="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</A>: X.Org development Archives: <A HREF="http://lists.x.org/archives/xorg-devel">http://lists.x.org/archives/xorg-devel</A> Info: <A HREF="http://lists.x.org/mailman/listinfo/xorg-devel">http://lists.x.org/mailman/listinfo/xorg-devel</A> </PRE> </BLOCKQUOTE> </BODY> </HTML>