diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 8 |
3 files changed, 11 insertions, 3 deletions
@@ -18,3 +18,7 @@ install-sh missing stamp-h1 *~ +*.o +bdftopcf-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 4b5a570..7323c28 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,7 +62,7 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 9031672..3eca14c 100644 --- a/configure.ac +++ b/configure.ac @@ -27,20 +27,24 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro +# Require xorg-macros: XORG_WITH_LINT, XORG_CWARNFLAGS, XORG_CHANGELOG m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.1) +XORG_MACROS_VERSION(1.2) AC_PROG_CC AC_PROG_INSTALL +XORG_CWARNFLAGS + # Checks for pkg-config packages PKG_CHECK_MODULES(BDFTOPCF, xfont) +BDFTOPCF_CFLAGS="$CWARNFLAGS $BDFTOPCF_CFLAGS" AC_SUBST(BDFTOPCF_CFLAGS) AC_SUBST(BDFTOPCF_LIBS) XORG_WITH_LINT XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |