diff options
author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-13 18:55:51 -0200 |
---|---|---|
committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-13 18:55:51 -0200 |
commit | c7f3c6652e9507e4303fd9ed913c593afb7447f0 (patch) | |
tree | bb78edc4cdd137a3f2e7eb6e9d6fdd3b2c9f9706 /configure.ac | |
parent | 828c0323450eadaf040749c010918679f5e4fe53 (diff) |
Ansification and compile warning fixes.
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, and corrects
make distcheck.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 4235f4a..24e7896 100644 --- a/configure.ac +++ b/configure.ac @@ -25,11 +25,17 @@ AC_INIT(x11perf,[1.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL +XORG_CWARNFLAGS + AC_PATH_PROG(SED,sed) if [[ -z $SED ]] ; then AC_MSG_ERROR([sed is needed to build x11perf]) @@ -39,6 +45,7 @@ AC_TYPE_SIGNAL # Checks for pkg-config packages PKG_CHECK_MODULES(X11PERF, x11 xmuu) +X11PERF_CFLAGS="$CWARNFLAGS $X11PERF_CFLAGS" AC_SUBST(X11PERF_CFLAGS) AC_SUBST(X11PERF_LIBS) @@ -78,5 +85,6 @@ esac XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |