summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-13 20:10:23 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-13 20:10:23 -0200
commit3a041bbccdee28b628ce5243e77d7d3125a186d4 (patch)
tree522e1d212db0b5732fb6c3514a9f7144728527c7 /configure.ac
parent0fbda267334eb531b7153c3b9035fe7470302e13 (diff)
downloadxdpyinfo-3a041bbccdee28b628ce5243e77d7d3125a186d4.tar.gz
xdpyinfo-3a041bbccdee28b628ce5243e77d7d3125a186d4.tar.bz2
xdpyinfo-3a041bbccdee28b628ce5243e77d7d3125a186d4.zip
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.ac8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 22bae81..c787a02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,13 +26,20 @@ AC_INIT(xdpyinfo,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo
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
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(XDPYINFO, xext x11 xtst)
+XDPYINFO_CFLAGS="$CWARNFLAGS $XDPYINFO_CFLAGS"
AC_SUBST(XDPYINFO_CFLAGS)
AC_SUBST(XDPYINFO_LIBS)
@@ -133,5 +140,6 @@ XORG_WITH_LINT
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile])