From: Gaetan Nadon <memsize@videotron.ca>
Date: Tue, 27 Oct 2009 19:07:24 +0000 (-0400)
Subject: Deploy the new XORG_DEFAULT_OPTIONS #24242
X-Git-Tag: xdpyinfo-1.2.0~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2fbd90b15cf45e2b0c5649bc575d04d09ce6f30;p=platform%2Fupstream%2Fxdpyinfo.git

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.
---

diff --git a/configure.ac b/configure.ac
index 7a12edc..8de5877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,15 +27,16 @@ 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)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 
-XORG_DEFAULT_OPTIONS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XDPYINFO, xext x11 xtst)