summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2009-10-27 15:07:25 -0400
committerGaetan Nadon <memsize@videotron.ca>2009-10-27 15:07:25 -0400
commit847b72d9de8dd839c391321b50312368e63e7305 (patch)
tree309d0fc05fc0f530c0e5dbe01b049a405ea1508f
parentf1c7f651838c7f2f33c0c9f9306d8d6df36206c7 (diff)
downloadxorg-lib-libXi-847b72d9de8dd839c391321b50312368e63e7305.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.ac7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 377dfe0..86c3615 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,16 +6,17 @@ AC_INIT(libXi, 1.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], l
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+# 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(src/config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
AC_PROG_SED
-XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.2.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 1.9.99.902])