summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-09-10 11:25:21 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-10 11:25:33 +1000
commit1f8f6431bf84228b3c5877be8e20eeb43dcab64d (patch)
tree2dff15eebedf034f48d7245c7f5a9c8cb0024578
parent6b476f2e22337e6d0b4f0e6194ed25e0ed0f9330 (diff)
Require xorg-macros 1.3 and XORG_DEFAULT_OPTIONS.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--configure.ac11
1 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 9135ad2..5b03f86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,16 +35,16 @@ AM_MAINTAINER_MODE
DRIVER_NAME=void
AC_SUBST([DRIVER_NAME])
-# 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"])
@@ -65,8 +65,5 @@ AC_SUBST([CFLAGS])
# Checks for header files.
AC_HEADER_STDC
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile src/Makefile man/Makefile])