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 | 0a51669c01210b384ccd8a71eae7972f78a79cba (patch) | |
| tree | 492cbfeb2467d40a00fe2959aff6f9cf109d4bb9 | |
| parent | da7c5d4d806fc2034589bba0a400e5a97053bbeb (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 2731ba9..ead5db8 100644 --- a/configure.ac +++ b/configure.ac @@ -26,14 +26,15 @@ AC_INIT(xsetmode,[1.0.0], [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(XSETMODE, xi x11) @@ -41,8 +42,5 @@ XSETMODE_CFLAGS="$CWARNFLAGS $XSETMODE_CFLAGS" AC_SUBST(XSETMODE_CFLAGS) AC_SUBST(XSETMODE_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile]) |