diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-03-30 09:26:13 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-04-01 16:14:16 -0400 |
| commit | d8d901323776599c8392f9b973ba129c3af45a4b (patch) | |
| tree | 3948696bc4a0d57da299a9547093777a3e8de2a7 | |
| parent | df94cb141f02f123a64b0ef7abf5f593c1b27e13 (diff) | |
config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
There are 2 headers to generate. The first one (config.h)
is picked up by autoheader to generate the familiar config.h.in
input file. The others in the list (or in subsequent AC_CONFIG_HEADERS
macro calls) are generated from their existing matching template,
e.g. fontconf.h.in.
When multiple headers are listed in the same macro call,
they cannot be separated by a new line like we do in AC_OUTPUT.
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 852124a..35ac80b 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,8 @@ AC_INIT([libXfont], 1.4.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfont) +# Autoheader generates config.h.in. No new lines allowed in the list. +AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h]) dnl dnl This is the package version number, not the shared library dnl version. This same version number must appear in Xfont.h @@ -33,8 +35,6 @@ dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's dnl not possible to extract the version number here from Xfont.h dnl AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_CONFIG_HEADER(config.h) -AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h]) AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS |