diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-11-15 18:11:36 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-11-15 18:11:36 -0500 |
| commit | caea0fd5a966a74465d965ecab89f4829dced157 (patch) | |
| tree | 0d4860debfee126aa1d031375a19c4c4c35f1f85 | |
| parent | f1b1d45cd955f24a338af098ebd6a181b1454b38 (diff) | |
configure.ac: 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.
| -rwxr-xr-x | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index bd9b86f..e885fa4 100755 --- a/configure.ac +++ b/configure.ac @@ -3,13 +3,15 @@ AC_INIT([Xproto], [7.0.16], [https://bugs.freedesktop.org/enter_bug.cgi?product= AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# 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 + AC_CONFIG_HEADER([do-not-use-config.h]) AC_CONFIG_HEADER([Xfuncproto.h]) -# Require xorg-macros: 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) - AC_CANONICAL_HOST m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) @@ -201,8 +203,6 @@ if test "x$WIDEPROTO" = xno; then AC_DEFINE(NARROWPROTO, [], [Narrow prototypes]) fi -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile Xpoll.h |