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>

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

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