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 | 5786d1deeab8fe6c6ed0481220e487e9ec5cfdf4 (patch) | |
| tree | bb069972a8c14de958a7c2d78453d37e84635604 | |
| parent | fac7fddbd5df94789d78cd0847dcd8684486d668 (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 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index a20ce3d..df25a4f 100644 --- a/configure.ac +++ b/configure.ac @@ -26,10 +26,11 @@ AC_INIT(xkbutils, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=x AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# 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])]) + [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) @@ -37,7 +38,6 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_INSTALL -XORG_DEFAULT_OPTIONS # xkbvleds checks PKG_CHECK_MODULES(XKBVLEDS, xaw7) @@ -54,8 +54,5 @@ PKG_CHECK_MODULES(XKBWATCH, xaw7) AC_SUBST(XKBWATCH_CFLAGS) AC_SUBST(XKBWATCH_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile]) |