summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-10-01 19:01:11 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-10-01 19:01:11 -0700
commitc33d7efc95d0775ad3cd9752c3dfd35d787cdecb (patch)
tree6a404c57f319be883094f3c38f28496da03301a6
parent15754397487840db5a36ec4ebf5292ad602ee1b3 (diff)
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-rw-r--r--configure.ac10
1 files changed, 4 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index d992d63..28238ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,12 +8,12 @@ AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.2 for 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 1.3 for 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)
AC_PROG_CC
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
AC_PROG_INSTALL
PKG_CHECK_MODULES(XLIB, x11)
@@ -25,6 +25,4 @@ AC_CHECK_FUNCS([unsetenv])
AC_SUBST(XLIB_CFLAGS)
AC_SUBST(XLIB_LIBS)
-XORG_CHANGELOG
-
AC_OUTPUT([Makefile doc/Makefile])