mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-26 23:25:08 +00:00
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. Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
committed by
Keith Packard
parent
0f38159cdd
commit
c93f516e85
@@ -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)'
|
||||
|
||||
Reference in New Issue
Block a user