diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-27 15:07:24 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-10-27 15:07:24 -0400 |
| commit | ae203a1bfd75964cc6b0ce95b702ec7e97eafc91 (patch) | |
| tree | 8c986a7d4a3fb925f39405bb7d09872d8d970f9d | |
| parent | e641baa6ffa24aec30fd773606b61b4895dbadd9 (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 1fec913..3ba8105 100644 --- a/configure.ac +++ b/configure.ac @@ -26,16 +26,17 @@ AC_INIT(ico,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],i AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG -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 AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL -XORG_CWARNFLAGS # Checks for pkg-config packages PKG_CHECK_MODULES(ICO, x11 >= 0.99.1) @@ -45,8 +46,5 @@ AC_SUBST(ICO_LIBS) XTHREADLIB=`$PKG_CONFIG --variable=xthreadlib x11` AC_SUBST(XTHREADLIB) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile]) |