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
commitfeda4dcbfcf7102297109101ba310a5c50ed6483 (patch)
treeec971317ac616cd1f1b8d69f4de68af0c4538432
parent24dd7a8ef6d9edc1145855eba880b7c3b5bb2284 (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.ac9
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 321cac4..34ad693 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,12 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
+# 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
@@ -56,8 +62,5 @@ AC_SUBST(XSM_CFLAGS)
AC_SUBST(XSM_LIBS)
AC_SUBST(appdefaultdir)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile])