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 | b5cfc1cdd367c93660259a86b3b6683c57e5d76a (patch) | |
| tree | d6deb46daa5a61e66ea6bd245113059037d7133c | |
| parent | 5524fa4d543932e4565b2235515fef9a5d9a501d (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 a92ec77..d88f605 100644 --- a/configure.ac +++ b/configure.ac @@ -11,17 +11,17 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +AM_CONFIG_HEADER([config.h]) -# Require xorg-macros at least 1.2.1 -XORG_MACROS_VERSION([1.2.1]) +# Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], - [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])]) -AM_CONFIG_HEADER([config.h]) + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS # Checks for programs. AC_PROG_LIBTOOL AC_PROG_CC -XORG_CWARNFLAGS # Checks for pkg-config packages PKG_CHECK_MODULES(ICE, xproto) @@ -47,8 +47,6 @@ XORG_WITH_LINT XORG_LINT_LIBRARY([ICE]) LINT_FLAGS="${LINT_FLAGS} ${ICE_CFLAGS} ${XTRANS_CFLAGS}" -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile |