diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-30 16:56:38 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-30 16:56:38 -0200 |
| commit | 13ee4d00a06421dfb5ee613cbd99a3111135c379 (patch) | |
| tree | 1f643f1c80a2916e1fe31772c712aef05cb31f92 /configure.ac | |
| parent | 168153d1e7d196ca46c5b2e286fcf7e7793f2804 (diff) | |
| download | xorg-lib-libXRes-13ee4d00a06421dfb5ee613cbd99a3111135c379.tar.gz | |
Janitor: Correct make distcheck and remove extra .gitignore files.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 97397bc..ce4ab28 100644 --- a/configure.ac +++ b/configure.ac @@ -33,37 +33,30 @@ dnl AC_INIT(libXres, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXres) AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) +# 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 +XORG_CWARNFLAGS # get modules -PKG_CHECK_MODULES(XRES, x11 xext xextproto) - -AC_SUBST(XRES_CFLAGS) -AC_SUBST(XRES_LIBS) # Check xres configuration, strip extra digits from package version to # find the required protocol version - RES_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] -PKG_CHECK_MODULES(RESOURCEEXT, resourceproto >= $RES_VERSION) - -AC_SUBST(RESOURCEEXT_CFLAGS) -AC_SUBST(RESOURCEEXT_LIBS) - -if test "x$GCC" = "xyes"; then - GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wnested-externs -fno-strict-aliasing" - CFLAGS="$GCC_WARNINGS $CFLAGS" -fi +PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= $RES_VERSION]) +XRES_CFLAGS="$CWARNFLAGS $XRES_CFLAGS" +AC_SUBST(XRES_CFLAGS) +AC_SUBST(XRES_LIBS) XORG_CHECK_MALLOC_ZERO XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile |