summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-22 16:29:51 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-22 16:29:51 -0200
commitdb17ca534037463051833eeaf6d09356c479565e (patch)
tree5b532599a970d5fa880d77eee102432894664cc6 /configure.ac
parentb45149922ee23a71efa013d3ef36ca4f6c6494be (diff)
Correct make distcheck.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 11 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 1b567d7..6f8dca5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,22 +26,30 @@ AC_INIT(xmodmap,[1.0.3], [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
+
AC_CHECK_FUNCS([strncasecmp])
# Checks for pkg-config packages
-PKG_CHECK_MODULES(DEP, x11)
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+PKG_CHECK_MODULES(XMODMAP, x11)
+XMODMAP_CFLAGS="$CWARNFLAGS $XMODMAP_CFLAGS"
+AC_SUBST(XMODMAP_CFLAGS)
+AC_SUBST(XMODMAP_LIBS)
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile])