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 | a5672981c3a0eedb1ac3833ce62b20bf851f038f (patch) | |
| tree | 96f07f7a593570468853e26bf0a2ebddd7f2fe05 | |
| parent | 13d73c17891b895bbbd540ada094de83610f85d1 (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 c6e6283..814f9d4 100644 --- a/configure.ac +++ b/configure.ac @@ -6,15 +6,16 @@ AC_INIT(libXevie, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xor 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) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS # Checks for pkg-config packages PKG_CHECK_MODULES(XEVIE, xproto x11 xextproto xext evieproto) @@ -23,9 +24,6 @@ AC_SUBST(XEVIE_CFLAGS) AC_SUBST(XEVIE_LIBS) XORG_CHECK_MALLOC_ZERO -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile |