summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2009-10-27 15:07:24 -0400
committerGaetan Nadon <memsize@videotron.ca>2009-10-27 15:07:24 -0400
commit8a6a1f4b7bde74b6df62ac949e75b4ba0aedff97 (patch)
tree1e7f41b14a4daf85dd76072a90c57049f148643b
parent8021c657bcc6f27b99ed7a61f4036d614c47367d (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.ac7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index e074a19..e24245b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,14 +27,15 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_WITH_LINT, XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 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
AC_PROG_CC
AC_PROG_INSTALL
-XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(BDFTOPCF, xfont)