From c33d7efc95d0775ad3cd9752c3dfd35d787cdecb Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 1 Oct 2009 19:01:11 -0700 Subject: Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS Signed-off-by: Alan Coopersmith --- configure.ac | 10 ++++------ 1 file 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]) -- cgit v1.2.3