diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-27 15:07:26 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-11-11 21:44:01 -0800 |
| commit | c93f516e850c2ef2b47cc2e282f9081ae7165ac7 (patch) | |
| tree | 7919a7fd423f2e17c383612aad63467ae89cca97 | |
| parent | 0f38159cdd154a29caab0342aee41378e9921929 (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.
Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index dda4f37a7..933609af7 100644 --- a/configure.ac +++ b/configure.ac @@ -32,9 +32,11 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE -# Require xorg-macros version 1.3.0 or newer for XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +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 m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])]) XORG_FONT_MACROS_VERSION(1.1) @@ -76,7 +78,6 @@ AC_SYS_LARGEFILE XORG_PROG_RAWCPP AC_PATH_PROG(SED,sed) -XORG_DEFAULT_OPTIONS # Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow # easier overrides at build time. XSERVER_CFLAGS='$(CWARNFLAGS)' |