From cf8a7c4463eba5ef3c63186ad539c201df3770f9 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Tue, 27 Oct 2009 15:07:26 -0400 Subject: Deploy the new XORG_DEFAULT_OPTIONS #24242 This macro aggregate a number of existing macros that sets commmon X.Org components configuration options. It shields the configuration file from future changes. --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 439d9e5..ffacb45 100644 --- a/configure.ac +++ b/configure.ac @@ -35,14 +35,15 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_DEFAULT_OPTIONS # Check render configuration, strip extra digits from package version to # find the required protocol version -- cgit v1.2.1