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
commita4a69387d7d0783326fbbd2b7b202498325d5f96 (patch)
tree05751f840aa49cf467b3466774c4e402beff1807
parent748ea77263a40080e665adc742a7a9791b4293c0 (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 e8ec861..c484186 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,9 +30,11 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_WITH_LINT, 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
AC_PROG_CC
AC_PROG_INSTALL
@@ -46,7 +48,6 @@ AC_CHECK_FUNCS([srand48 lrand48])
AC_SEARCH_LIBS([recvfrom],[socket])
PKG_CHECK_MODULES(XDMCP, xproto)
-XORG_DEFAULT_OPTIONS
XDMCP_CFLAGS="$CWARNFLAGS $XDMCP_CFLAGS"
AC_SUBST(XDMCP_CFLAGS)
AC_SUBST(XDMCP_LIBS)