[PATCH libXfont] config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Gaetan Nadon
memsize at videotron.ca
Tue Mar 30 06:32:44 PDT 2010
Both headers end up created by the same macro.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
Makefile.am | 3 +--
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
--
1.6.0.4
More information about the xorg-devel
mailing list