summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-26 16:45:11 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-26 16:45:11 -0200
commit29f87977d6f503186da4863eea28db2f206bca22 (patch)
treefc4f2f9c334beea8cfde156fda204b1604efadf1 /configure.ac
parentfc0b73673a7b91b386d8a346652f9cc0c4a68d44 (diff)
Correct make distcheck and sparse warnings.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac9
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 6348b55..3ca09e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,13 +25,18 @@ AC_INIT(xrdb,[1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
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
AC_CHECK_FUNC([mkstemp],
- AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.]))
+ AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the 'mkstemp' function.]))
# Find MAXHOSTNAMELEN definition
# Common hidey holes:
@@ -77,10 +82,12 @@ AC_DEFINE_UNQUOTED([CPP], "$CPP_PATH", [Path to CPP program])
# Checks for pkg-config packages
PKG_CHECK_MODULES(XRDB, xmuu x11)
+XRDB_CFLAGS="$CWARNFLAGS $XRDB_CFLAGS"
AC_SUBST(XRDB_CFLAGS)
AC_SUBST(XRDB_LIBS)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile])