summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2009-10-27 15:07:25 -0400
committerGaetan Nadon <memsize@videotron.ca>2009-11-14 09:20:49 -0500
commitf60d8d7272efb6da4fd91df9675d9281e4230d9f (patch)
treefd7d1c111a62af2cfd4156da24a647f66f0fd2de
parentb748221cf9e7df8b0b460f13f4ad0a86ff7f1b6d (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 ede111e..53c8a87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,10 @@ 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)
@@ -45,7 +47,6 @@ AC_CHECK_FUNCS([killpg])
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
-XORG_DEFAULT_OPTIONS
# Build options
DEFAULT_XRDB=xrdb