From 5954421ac06cae78f77ea73b07ba9fd01b16af6d Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Sat, 24 Oct 2009 15:27:09 +0000
Subject: Update to xvinfo 1.1.0

---
 app/xvinfo/configure.ac | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'app/xvinfo/configure.ac')

diff --git a/app/xvinfo/configure.ac b/app/xvinfo/configure.ac
index 07bc137a8..d7ca8921b 100644
--- a/app/xvinfo/configure.ac
+++ b/app/xvinfo/configure.ac
@@ -22,21 +22,25 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xvinfo,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xvinfo)
+AC_INIT(xvinfo, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xvinfo)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+	  [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 
+XORG_DEFAULT_OPTIONS
+
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XVINFO, xv x11)
 AC_SUBST(XVINFO_CFLAGS)
 AC_SUBST(XVINFO_LIBS)
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
 AC_OUTPUT([Makefile])
-- 
cgit v1.2.3