diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-03-30 09:26:13 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-03-30 13:15:52 -0400 |
| commit | 8e84687b26be6e8f5da4fce173c0a134eb07f4f3 (patch) | |
| tree | 729bc244ceb2e11bd5159274725a7c57a550ef54 | |
| parent | a7b7bc72b9ad061ed164601d2d18dbffd6ec1f4f (diff) | |
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@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 7aee053..49102e8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,6 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xfont.pc MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST = include/X11/fonts/fontconf.h.in .PHONY: ChangeLog INSTALL @@ -57,7 +56,7 @@ ChangeLog: dist-hook: ChangeLog INSTALL # Developer documentation - not installed on system -EXTRA_DIST += doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css +EXTRA_DIST = doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css if ENABLE_DEVEL_DOCS if HAVE_XMLTO diff --git a/configure.ac b/configure.ac index 852124a..98dac59 100644 --- a/configure.ac +++ b/configure.ac @@ -33,8 +33,8 @@ 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]) +AC_CONFIG_HEADERS([config.h + include/X11/fonts/fontconf.h]) AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS |