On Wed, Mar 31, 2010 at 2:46 PM, Jeremy Huddleston <[email protected]> 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 <[email protected]> >> 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 <[email protected]> >> Signed-off-by: Gaetan Nadon <[email protected]>
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. 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. This should probably just be reverted for now until it gets straightened out. -- Dan _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
