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 | ca6781c3040f4bd3fbe3f0a1f89e7bcc92bf5a9f (patch) | |
| tree | de33cf3d36fcb4ec40c3e1ac36423bff7f24bdf5 | |
| parent | 8eb678dc5d32719434667593202175d66c347c12 (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 8e8f45a..532729c 100644 --- a/configure.ac +++ b/configure.ac @@ -26,14 +26,15 @@ AC_INIT(xstdcmap,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo 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(XSTDCMAP, xmu x11) @@ -41,8 +42,5 @@ XSTDCMAP_CFLAGS="$CWARNFLAGS $XSTDCMAP_CFLAGS" AC_SUBST(XSTDCMAP_CFLAGS) AC_SUBST(XSTDCMAP_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile]) |