summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-12 18:35:55 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-12 18:35:55 -0200
commitaa10bf36fa16cb9e832971daecb92a6de3d346d5 (patch)
tree88bfa1ac962249865fef7eac0fac8486f715fd0a /configure.ac
parentc1adeeb234f9d47d1639f5223371ac99ac22d565 (diff)
Ansification and compile warning fixes.
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects make distcheck and all gcc 4.3 and sparse warnings.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac11
1 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index b1d47c3..1529d36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,21 +26,28 @@ AC_INIT(listres,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xor
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
+
PKG_CHECK_MODULES(XAW, xaw7)
# Checks for pkg-config packages
PKG_CHECK_MODULES(LISTRES, x11 xt xmu)
-LISTRES_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS"
-LISTRES_LIBS="$DEP_LIBS $XAW_LIBS"
+LISTRES_CFLAGS="$CWARNFLAGS $LISTRES_CFLAGS $XAW_CFLAGS"
+LISTRES_LIBS="$LISTRES_LIBS $XAW_LIBS"
AC_SUBST(LISTRES_CFLAGS)
AC_SUBST(LISTRES_LIBS)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile])