summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-30 20:41:31 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-30 20:41:31 -0200
commit3237cc5b45a41ffe93ebde10b1090a7f2db6f88e (patch)
treecf72fc42b228c96d517d5e5ba3abea3b4641122a /configure.ac
parent48544103324d1816139dfafe5873a11c88ee05b6 (diff)
Janitor: ansification, make distcheck, compiler warnings.
Manual page generation, and xmlto handling, shamelessly cut&paste'd from libXi/man/Makefile.am, so that make distcheck will work.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac11
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index b310518..61d4bc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,11 +27,15 @@ AC_INIT(libXtst, 1.0.3, [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)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
# Check for xmlto for man page conversion
# (only needed by people building tarballs)
@@ -41,17 +45,18 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
# Check for dependencies
PKG_CHECK_MODULES(XTST, x11 xext xi recordproto xextproto inputproto)
+XTST_CFLAGS="$CWARNFLAGS $XTST_CFLAGS"
+AC_SUBST(XTST_CFLAGS)
+AC_SUBST(XTST_LIBS)
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
XORG_LINT_LIBRARY([Xtst])
LINT_FLAGS="${LINT_FLAGS} ${XTST_CFLAGS}"
-AC_SUBST(XTST_CFLAGS)
-AC_SUBST(XTST_LIBS)
-
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
man/Makefile