diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-05-03 13:33:46 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-05-03 13:33:46 +0000 |
| commit | e6fc7eee24da36df4a0a96bd3da04b40e754347a (patch) | |
| tree | 17ff42ca1528b956e3ca9591f03f3deb8894e4e6 /driver/xf86-input-acecad/configure.ac | |
| parent | cb30426369feb6c054f91003ddd7be346fbf6158 (diff) | |
update to xf86-input-acecad 1.3.0
Diffstat (limited to 'driver/xf86-input-acecad/configure.ac')
| -rw-r--r-- | driver/xf86-input-acecad/configure.ac | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/driver/xf86-input-acecad/configure.ac b/driver/xf86-input-acecad/configure.ac index 9fea96ec9..1787cb43e 100644 --- a/driver/xf86-input-acecad/configure.ac +++ b/driver/xf86-input-acecad/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-acecad], - 1.2.2, + 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-acecad) @@ -32,15 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -DRIVER_NAME=acecad -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"]) @@ -77,9 +78,7 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) sdkdir=$(pkg-config --variable=sdkdir xorg-server) - -CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -AC_SUBST([CFLAGS]) +XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" # Checks for libraries. @@ -88,11 +87,17 @@ AC_HEADER_STDC AC_HEADER_CHECK([linux/input.h], [AC_DEFINE([LINUX_INPUT], [1], [Using the Linux input subsystem])] ) -AC_HEADER_CHECK([sysfs/libsysfs.h], - [AC_DEFINE([LINUX_SYSFS], [1], [Using sysfs to probe devices])] - ) +AC_CHECK_HEADER(sysfs/libsysfs.h, HAVE_LIBSYSFS=yes, HAVE_LIBSYSFS=no) +if test x$HAVE_LIBSYSFS = xyes; then + AC_DEFINE(LINUX_SYSFS, 1, [Using sysfs to probe devices]) +fi +AM_CONDITIONAL(HAVE_LIBSYSFS, test x$HAVE_LIBSYSFS = xyes) + +DRIVER_NAME=acecad +AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile man/Makefile]) |