diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index a90e384b..bbc394ba 100644 --- a/configure.ac +++ b/configure.ac @@ -14,14 +14,15 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER([src/config.h]) AC_CONFIG_HEADER([include/X11/XlibConf.h]) -# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.1) +# 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) # Checks for programs. AC_PROG_LIBTOOL DOLT AC_PROG_CC +XORG_CWARNFLAGS if test x"$CC_FOR_BUILD" = x; then if test x"$cross_compiling" = xyes; then @@ -380,8 +381,7 @@ X11_LIBDIR="${libdir}/X11" AC_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data]) AC_SUBST(X11_LIBDIR) -X11_CFLAGS="$X11_CFLAGS $XPROTO_CFLAGS" - +X11_CFLAGS="$CWARNFLAGS $X11_CFLAGS $XPROTO_CFLAGS" AC_SUBST(X11_CFLAGS) AC_SUBST(X11_LIBS) @@ -414,6 +414,7 @@ AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database]) XORG_CHECK_MALLOC_ZERO XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile include/Makefile |