From: Gaetan Nadon <memsize@videotron.ca>
Date: Tue, 27 Oct 2009 19:07:25 +0000 (-0400)
Subject: Deploy the new XORG_DEFAULT_OPTIONS #24242
X-Git-Url: https://diplodocus.org/git/xorg-xinput/commitdiff_plain/1a0f0a03655769afc337a715fcc81fe8ad3c2693?ds=sidebyside;hp=--cc

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

1a0f0a03655769afc337a715fcc81fe8ad3c2693
diff --git a/configure.ac b/configure.ac
index d2024d1..c80d653 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,15 +7,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(XINPUT, x11 xext [xi >= 1.2] [inputproto >= 1.5])