diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 665572b..09940ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,10 +21,6 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src -EXTRA_DIST = ChangeLog - -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog ChangeLog: diff --git a/configure.ac b/configure.ac index e4d4732..f24f5a1 100644 --- a/configure.ac +++ b/configure.ac @@ -30,9 +30,11 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) -# Require xorg-macros: XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AM_INIT_AUTOMAKE([dist-bzip2]) @@ -131,10 +133,6 @@ AM_CONDITIONAL([I386ARCH], [test $is386 = true]) DRIVER_NAME=geode AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([ Makefile src/Makefile |