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 | 02cd3d7a617c71dbc13023f91f41b896dc260c50 (patch) | |
| tree | 884396e95796f72c3e54807143c999f81b726f09 | |
| parent | 1ca6aefa6690930b336490525f5ed515ddad26ac (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 f0ef580..cda2349 100644 --- a/configure.ac +++ b/configure.ac @@ -34,14 +34,15 @@ AC_CONFIG_SRCDIR([Makefile.am]) 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 AC_ARG_WITH(icondir, AC_HELP_STRING([--with-icondir=<path>], @@ -72,9 +73,6 @@ XCURSOR_CFLAGS="$CWARNFLAGS $XCURSOR_CFLAGS" AC_SUBST(XCURSOR_CFLAGS) AC_SUBST(XCURSOR_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT |