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-Tag: xmodmap-1.0.5~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=817f5345cf42ba4c903c62b5ff814e9c9e3fed3f;p=platform%2Fupstream%2Fxmodmap.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 3efd2a7..94cb38f 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
 
 AC_CHECK_FUNCS([strncasecmp])