diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-27 15:07:25 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-10-27 15:07:25 -0400 |
| commit | c22d67cc78c27d19bb6eaba5bf71b66444ed4a40 (patch) | |
| tree | 69138a0698659437d70dc1be70ce451cd9198837 /configure.ac | |
| parent | 271382b01995469eb60035d38880f9d3665d4c4c (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.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 399f7d0..45f6f94 100644 --- a/configure.ac +++ b/configure.ac @@ -36,9 +36,11 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_CONFIG_HEADER(config.h) AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h]) -# Require xorg-macros version >= 1.3.0 for XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 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 # Check for progs AC_PROG_CC @@ -47,7 +49,6 @@ dnl If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config dnl must first be located explicitly. PKG_PROG_PKG_CONFIG -XORG_DEFAULT_OPTIONS # xmlto is used to convert doc/fontlib.xml from DocBook to PDF/HTML AC_ARG_VAR([XMLTO], [Path to xmlto command]) |