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 | 31fe929d3ea43cd8fbe2853157682677704883ad (patch) | |
| tree | fba2d4d4ee6579a7868624072dc485b6d1d384b9 | |
| parent | f6ae36d4bf43cd601c3c1339100684169bbaeeb3 (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 5ac3af1..a786656 100644 --- a/configure.ac +++ b/configure.ac @@ -30,9 +30,11 @@ 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 AC_PROG_CC AC_PROG_INSTALL @@ -40,7 +42,6 @@ AC_PROG_LN_S AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL AC_PROG_MAKE_SET -XORG_CWARNFLAGS PKG_CHECK_MODULES(XAU, xproto) XAU_CFLAGS="$CWARNFLAGS $XAU_CFLAGS" @@ -76,9 +77,6 @@ XORG_WITH_LINT XORG_LINT_LIBRARY([Xau]) LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}" -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile xau.pc]) |