[PATCH 4/5] xserver: Deploy the new XORG_DEFAULT_OPTIONS #24242

[Alan Coopersmith]

The m4_fatal version is what I've been using when adding it, since it
causes the error to be reported when autoconf is run, not waiting until
configure is run, so that's okay with me.

For the placement of XORG_DEFAULT_OPTIONS, the only warning I have when
moving it is to be careful with modules that use macros such as
AC_USE_SYSTEM_EXTENSIONS that want to be run before macros that call the
compiler, since some of the XORG_DEFAULT_OPTIONS macros do use the compiler.
Certainly it makes logical sense to have it grouped with the XORG_MACROS_VERSION
call.

	-alan-

Gaetan Nadon wrote:
> For xserver, the macro was already there, just standardize the text and
> location to be the same in all modules.
> 
> ---
> configure.ac |    7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index dda4f37..933609a 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -32,9 +32,11 @@ AC_CONFIG_SRCDIR([Makefile.am])
> AM_INIT_AUTOMAKE([dist-bzip2 foreign])
> AM_MAINTAINER_MODE
> 
> -# Require xorg-macros version 1.3.0 or newer for XORG_DEFAULT_OPTIONS
> -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
> 
> m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil
> 1.1 or later before running autoconf/autogen])])
> XORG_FONT_MACROS_VERSION(1.1)
> @@ -76,7 +78,6 @@ AC_SYS_LARGEFILE
> XORG_PROG_RAWCPP
> AC_PATH_PROG(SED,sed)
> 
> -XORG_DEFAULT_OPTIONS
> # Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow
> # easier overrides at build time.
> XSERVER_CFLAGS='$(CWARNFLAGS)'
> -- 
> 1.6.0.4
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> xorg-devel mailing list
> xorg-devel at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-devel

-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering