summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-10-06 13:19:45 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-10-06 13:19:45 -0700
commit459a6ac9876b86533b17c996200a8a492e32841c (patch)
tree2771765fbc909f9f1b38832a0408aa2931ddc87d /configure.ac
parent8a5876f71cbad2a02eb6c47772cf46c17bc1f451 (diff)
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac11
1 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 27736f8..dd2ac31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,27 +26,24 @@ AC_INIT(libXvMC, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-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, XORG_WITH_LINT
+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)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
# Check for dependencies
PKG_CHECK_MODULES(XVMC, x11 xext xv xextproto videoproto)
-XVMC_CFLAGS="$CWARNFLAGS $XVMC_CFLAGS"
AC_SUBST(XVMC_CFLAGS)
AC_SUBST(XVMC_LIBS)
AC_CHECK_FUNC([shmat], AC_DEFINE(HAS_SHM,1,[Has shm*() functions]))
XORG_CHECK_MALLOC_ZERO
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT