[PATCH video-qlx 1/7] configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242

[Gaetan Nadon]

This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration
file from future changes.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6a6cbe1..de60374 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,24 +20,29 @@
 #
 # Process this file with autoconf to produce a configure script
 
-AC_PREREQ(2.57)
+AC_PREREQ([2.60])
 AC_INIT([xf86-video-qxl],
-        0.0.8,
+        [0.0.8],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-        xf86-video-qxl)
-
+        [xf86-video-qxl])
 AC_CONFIG_SRCDIR([Makefile.am])
+AC_CANONICAL_HOST
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
 AM_CONFIG_HEADER([config.h])
-AC_CONFIG_AUX_DIR(.)
 
-AM_INIT_AUTOMAKE([dist-bzip2])
-
-AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.4)
+XORG_DEFAULT_OPTIONS
 
 # Checks for programs.
 AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
 AC_PROG_CC
+AC_PROG_CC_C99
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
 
 AH_TOP([#include "xorg-server.h"])
 
@@ -87,9 +92,6 @@ AC_HEADER_STDC
 DRIVER_NAME=qxl
 AC_SUBST([DRIVER_NAME])
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
 AC_OUTPUT([
 	Makefile
 	src/Makefile
-- 
1.6.0.4