summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-09-11 11:54:31 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-11 11:54:36 +1000
commitc51255043e97ff65adebb7527c6b5b68fa2ff038 (patch)
tree771309a5c1fce5d4125d4550ab37b27c4df5ada8
parentf6d158802c2a3a0083d110428699027939276e44 (diff)
Require xorg-macros 1.3 for XORG_DEFAULT_OPTIONS
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--configure.ac12
1 files changed, 4 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 1787cb4..4be9c2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,16 +32,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], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
AH_TOP([#include "xorg-server.h"])
@@ -96,8 +96,4 @@ AM_CONDITIONAL(HAVE_LIBSYSFS, test x$HAVE_LIBSYSFS = xyes)
DRIVER_NAME=acecad
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
AC_OUTPUT([Makefile src/Makefile man/Makefile])