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 | 4b7c8a8ef337614c831b2555afeb6d89dbc14fb1 (patch) | |
| tree | 6b525d843e44bc745554bd433bcc9ef0e14d5338 | |
| parent | 5fa9ef7e5e87f875dd92cc33403cebf6c60c557f (diff) | |
| download | xorg-app-xkbcomp-4b7c8a8ef337614c831b2555afeb6d89dbc14fb1.tar.gz | |
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 16b9975..51457fc 100644 --- a/configure.ac +++ b/configure.ac @@ -25,9 +25,11 @@ AC_INIT(xkbcomp,[1.1.1], [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) @@ -35,7 +37,6 @@ AC_PROG_CC AC_PROG_YACC AC_PROG_INSTALL -XORG_CWARNFLAGS AC_CHECK_FUNCS([strdup strcasecmp]) @@ -52,8 +53,5 @@ AC_ARG_WITH([xkb_config_root], [XKBCONFIGROOT='${datadir}/X11/xkb']) AC_SUBST([XKBCONFIGROOT]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile]) |