fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-01-01 18:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to using xorg-macros 1.3 & XORG_DEFAULT_OPTIONS

Browse source 
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
This commit is contained in:
Alan Coopersmith 2009-09-18 16:58:16 -07:00
parent 51396066c8
commit bfa19cddd8
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
configure.ac
View file

@ -14,9 +14,9 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER([src/config.h])
AC_CONFIG_HEADER([include/X11/XlibConf.h])
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
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, XORG_CHANGELOG, XORG_WITH_LINT
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
# Set common system defines for POSIX extensions, such as _GNU_SOURCE
# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
@ -27,7 +27,7 @@ AC_USE_SYSTEM_EXTENSIONS
AC_PROG_LIBTOOL
DOLT
AC_PROG_CC
XORG_CWARNFLAGS
XORG_DEFAULT_OPTIONS
if test x"$CC_FOR_BUILD" = x; then
if test x"$cross_compiling" = xyes; then
@ -330,8 +330,6 @@ AC_ARG_ENABLE(xkb,
[Disable XKB support *EXPERIMENTAL*]),
[XKB=$enableval],[XKB=yes])
XORG_MANPAGE_SECTIONS
AC_ARG_ENABLE(man-pages,
AC_HELP_STRING([--enable-man-pages=section],
[Choose manual section for installing man pages]),
@ -419,10 +417,7 @@ AC_DEFINE_DIR(XKEYSYMDB, XKEYSYMDB, [Location of keysym database])
XERRORDB="${X11_DATADIR}/XErrorDB"
AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])
XORG_CHECK_MALLOC_ZERO
XORG_RELEASE_VERSION
XORG_CHANGELOG
AC_OUTPUT([Makefile
include/Makefile