diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-30 16:49:59 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-30 16:49:59 -0200 |
| commit | 3747f97f133b5fe8dea0d1991d68c4693d488aae (patch) | |
| tree | 2af42e1578c93a08e8a2ab8078d1d2ed4eba9346 /configure.ac | |
| parent | f6f784c0f98c28915bd26d04e4d8839806e29877 (diff) | |
Janitor: make distcheck, compiler warnings, .gitignore.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 1f4409e..2056806 100644 --- a/configure.ac +++ b/configure.ac @@ -34,22 +34,15 @@ AC_INIT(libXrender, 0.9.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=x 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) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL - -# Check for X -PKG_CHECK_MODULES(X, x11) - -X_REQUIRES="x11" -X_NON_PKG_CFLAGS="" -X_NON_PKG_LIBS="" - -AC_SUBST(X_REQUIRES) -AC_SUBST(X_NON_PKG_CFLAGS) -AC_SUBST(X_NON_PKG_LIBS) +XORG_CWARNFLAGS # Check render configuration, strip extra digits from package version to # find the required protocol version @@ -59,12 +52,13 @@ if test "$VERSION" = "" ; then fi RENDER_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] AC_SUBST(RENDER_VERSION) -PKG_CHECK_MODULES(RENDER, renderproto >= $RENDER_VERSION) - +PKG_CHECK_MODULES(RENDER, x11 renderproto >= $RENDER_VERSION) +RENDER_CFLAGS="$CWARNFLAGS $RENDER_CFLAGS" AC_SUBST(RENDER_CFLAGS) XORG_CHECK_MALLOC_ZERO XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile |