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 | 72408025c0e903fd786b9d3f7997fb06cae09d57 (patch) | |
| tree | 66a011fbb19d2149684da8893860aaf3b4dd2ce5 | |
| parent | 4c9cf38d4788db369d04d03bfd5a510b681a2948 (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 c70fd40..7375a59 100644 --- a/configure.ac +++ b/configure.ac @@ -26,9 +26,11 @@ AC_INIT(showfont,[1.0.2], [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) @@ -36,7 +38,6 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_INSTALL -XORG_CWARNFLAGS # Checks for pkg-config packages PKG_CHECK_MODULES(SHOWFONT, libfs) @@ -44,8 +45,5 @@ SHOWFONT_CFLAGS="$CWARNFLAGS $SHOWFONT_CFLAGS" AC_SUBST(SHOWFONT_CFLAGS) AC_SUBST(SHOWFONT_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile]) |