diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-28 16:55:37 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-28 16:55:37 -0200 |
| commit | dbb950061f185e1ccf27bff9c71adc34ab4cfae0 (patch) | |
| tree | 2b4b7a4c588ec25f7e654932ac20a3d3a9cf23f9 /configure.ac | |
| parent | 2f41ddb3a917c4e71184452b68561a15593d33b8 (diff) | |
Janitor: Correct sparse warnings.
Also reorders some code in configure.ac and Makefile.am to
match pattern used on other packages.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 657a38b..3216b53 100644 --- a/configure.ac +++ b/configure.ac @@ -12,14 +12,20 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros at least 1.2.1 +XORG_MACROS_VERSION([1.2.1]) +m4_ifndef([XORG_MACROS_VERSION], + [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])]) AM_CONFIG_HEADER([config.h]) # Checks for programs. AC_PROG_LIBTOOL AC_PROG_CC +XORG_CWARNFLAGS # Checks for pkg-config packages PKG_CHECK_MODULES(ICE, xproto) +ICE_CFLAGS="$CWARNFLAGS $ICE_CFLAGS" AC_SUBST(ICE_CFLAGS) AC_SUBST(ICE_LIBS) @@ -36,21 +42,13 @@ AC_DEFINE(ICE_t, 1, [Xtrans transport type]) # Checks for header files. AC_HEADER_STDC -# Require xorg-macros at least 1.2.1 -XORG_MACROS_VERSION([1.2.1]) -m4_ifndef([XORG_MACROS_VERSION], - [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])]) - dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([ICE]) LINT_FLAGS="${LINT_FLAGS} ${ICE_CFLAGS} ${XTRANS_CFLAGS}" -XORG_CHANGELOG - -XORG_CWARNFLAGS - XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile |