summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2009-10-27 15:07:24 -0400
committerGaetan Nadon <memsize@videotron.ca>2009-10-27 15:07:24 -0400
commitdbbb35c25e8e0159b09a6756a143ac43720fe41a (patch)
treef03645b8386749ae287655f8050f14a6024bc3b6
parentb14f17671753e5c9c393fd1e972da93d8d94a366 (diff)
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.
-rw-r--r--configure.ac5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index e4b2291..cb8e1a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,8 +27,10 @@ AM_INIT_AUTOMAKE([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)
@@ -36,7 +38,6 @@ AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_INSTALL
-XORG_DEFAULT_OPTIONS
AC_CHECK_FUNC([mkstemp],
AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the "mkstemp" function.]))