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 | 612511cd3cc12ae353afd7133bdcee69ed4add0b (patch) | |
tree | 840f868c63a981f8daf071facecd05c5ed6f2c84 | |
parent | ac9d9c1171e06acfde5659ffd65676355b9188f0 (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 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index c3907dc..0963b59 100644 --- a/configure.ac +++ b/configure.ac @@ -27,15 +27,16 @@ AC_INIT(libxkbui, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xor AM_INIT_AUTOMAKE([foreign 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 # Check for dependencies PKG_CHECK_MODULES(XKBUI, x11 xkbfile) @@ -44,8 +45,6 @@ XKBUI_CFLAGS="$CWARNFLAGS $XKBUI_CFLAGS" AC_SUBST(XKBUI_CFLAGS) AC_SUBST(XKBUI_LIBS) -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile |