summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-02-02 19:47:50 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-02-02 19:52:32 -0200
commit095766ebb3afafc4906cb29e22d996dbcd773ad8 (patch)
tree814ec027d3f1ea42a32cfa08a3e88428e25320fe /configure.ac
parent0dbb88c52b057cfdff6116060060841e4fc4abb5 (diff)
Janitor: make distcheck, .gitignore.
Remove non toplevel .gitignore and .cvsignore files. The "make distcheck correction" for $(sdkdir) probably has a better approach using a "*-hook:" target, or possibly making $sdkdir a configure time option that could be set with DISTCHECK_CONFIGURE_FLAGS.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac18
1 files changed, 11 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 4ba5a8a..809799f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,15 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-DRIVER_NAME=evdev
-AC_SUBST([DRIVER_NAME])
-
+# 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])
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
+XORG_CWARNFLAGS
AH_TOP([#include "xorg-server.h"])
@@ -72,19 +73,22 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
+sdkdir=$(pkg-config --variable=sdkdir xorg-server |
+ sed -e 's@/usr/include@$(includedir)@')
AC_SUBST(sdkdir)
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-AC_SUBST([CFLAGS])
-
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
+DRIVER_NAME=evdev
+AC_SUBST([DRIVER_NAME])
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile