diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-27 15:07:26 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-10-27 15:07:26 -0400 |
| commit | fe1b6951a8e6ac4006b4f488121746cf71e4771d (patch) | |
| tree | 0a4159ced2c28b07742aa0211e1125e5f46f774f | |
| parent | 7c8ac21a9485beab00560764d16e41a4c26cfc02 (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.ac | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 6d0ce5d..38ada5e 100644 --- a/configure.ac +++ b/configure.ac @@ -29,14 +29,15 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# 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 AC_PROG_LIBTOOL -XORG_CWARNFLAGS # Check for dependencies PKG_CHECK_MODULES(XSCRNSAVER, x11 xext xextproto [scrnsaverproto >= 1.2]) @@ -49,9 +50,6 @@ XORG_WITH_LINT XORG_LINT_LIBRARY([Xss]) XORG_CHECK_MALLOC_ZERO -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile |