diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 13 |
2 files changed, 6 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index aa89732..be1be4c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,7 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man -EXTRA_DIST = README.multihead ChangeLog - -MAINTAINERCLEANFILES=ChangeLog +EXTRA_DIST = README.multihead .PHONY: ChangeLog diff --git a/configure.ac b/configure.ac index d205eb3..bc02ca0 100644 --- a/configure.ac +++ b/configure.ac @@ -34,15 +34,16 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, 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 # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC -XORG_CWARNFLAGS AH_TOP([#include "xorg-server.h"]) @@ -87,10 +88,6 @@ AC_SUBST([moduledir]) DRIVER_NAME=cirrus AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([ Makefile src/Makefile |