diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-03-31 20:21:47 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-03-31 20:21:47 -0400 |
| commit | df94cb141f02f123a64b0ef7abf5f593c1b27e13 (patch) | |
| tree | be9951fcbe019cc84d1dfb0185015dc4e16405e6 | |
| parent | 8e84687b26be6e8f5da4fce173c0a134eb07f4f3 (diff) | |
Revert "config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS"
This reverts commit 8e84687b26be6e8f5da4fce173c0a134eb07f4f3.
Until the issue is resolved on MAC O/S
http://tinderbox.x.org/builds/2010-03-31-0030/logs/libXfont/
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 49102e8..7aee053 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,6 +44,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xfont.pc MAINTAINERCLEANFILES = ChangeLog INSTALL +EXTRA_DIST = include/X11/fonts/fontconf.h.in .PHONY: ChangeLog INSTALL @@ -56,7 +57,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 98dac59..852124a 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]) -AC_CONFIG_HEADERS([config.h - include/X11/fonts/fontconf.h]) +AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h]) AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS |