summaryrefslogtreecommitdiff
path: root/configure.ac
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
commit7f4c2b588bc94702eb0df0618a97413b0e544879 (patch)
treeaa608fe1a59aca59f98c9b8bbd584192e9bb5441 /configure.ac
parent5c13f89a73f7b57dad9c9dcfd63e084077550c3e (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.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac11
1 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 8b049f8..c888e62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,9 +27,11 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_RELEASE_VERSION 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
AC_PROG_CC
AC_PROG_INSTALL
@@ -44,9 +46,6 @@ PKG_CHECK_MODULES(TWM, x11 xext xt xmu ice sm)
AC_SUBST(TWM_CFLAGS)
AC_SUBST(TWM_LIBS)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile