diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 63 | ||||
| -rw-r--r-- | include/Makefile.am | 1 | ||||
| -rw-r--r-- | man/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/evdev.c | 1 |
6 files changed, 34 insertions, 40 deletions
diff --git a/Makefile.am b/Makefile.am index 47d5e78..00c7940 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# Ensure headers are installed below $(prefix) for distcheck +# Provide an sdk location that is writable by the evdev module DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg' SUBDIRS = src man include diff --git a/configure.ac b/configure.ac index 2a6cf3b..da46c68 100644 --- a/configure.ac +++ b/configure.ac @@ -20,33 +20,37 @@ # # Process this file with autoconf to produce a configure script -AC_PREREQ(2.57) +# Initialize Autoconf +AC_PREREQ([2.60]) AC_INIT([xf86-input-evdev], - 2.4.0, + [2.4.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - xf86-input-evdev) - + [xf86-input-evdev]) AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Initialize libtool +AC_DISABLE_STATIC +AC_PROG_LIBTOOL + +# Initialize X.Org macros m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.4) XORG_DEFAULT_OPTIONS -AM_CONFIG_HEADER([config.h]) - # Checks for programs. -AC_DISABLE_STATIC -AC_PROG_LIBTOOL -AC_PROG_CC +AC_PROG_INSTALL -AH_TOP([#include "xorg-server.h"]) +# Obtain compiler/linker options from server and required extensions +PKG_CHECK_MODULES(XORG, xorg-server xproto inputproto) +# Define a configure option for an alternate input module directory AC_ARG_WITH(xorg-module-dir, AC_HELP_STRING([--with-xorg-module-dir=DIR], [Default xorg module directory [[default=$libdir/xorg/modules]]]), @@ -55,28 +59,21 @@ AC_ARG_WITH(xorg-module-dir, inputdir=${moduledir}/input AC_SUBST(inputdir) -# Checks for extensions -XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) +# X Server SDK location is required to install evdev header files +# This location is also relayed in the xorg-evdev.pc file +sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` -# Checks for pkg-config packages. We need to be able to override sdkdir -# to satisfy silly distcheck requirements. -PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) - -AC_ARG_WITH([sdkdir], [], - [sdkdir="$withval"], - [sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`]) +# Workaround overriding sdkdir to be able to create a tarball when user has no +# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am +AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) AC_SUBST([sdkdir]) -# Checks for libraries. - -# Checks for header files. -AC_HEADER_STDC - DRIVER_NAME=evdev AC_SUBST([DRIVER_NAME]) -AC_OUTPUT([Makefile - src/Makefile - man/Makefile - include/Makefile - xorg-evdev.pc]) +AC_CONFIG_FILES([Makefile + src/Makefile + man/Makefile + include/Makefile + xorg-evdev.pc]) +AC_OUTPUT diff --git a/include/Makefile.am b/include/Makefile.am index 58d7c39..0e3fc1b 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,2 +1 @@ -EXTRA_DIST = evdev-properties.h sdk_HEADERS = evdev-properties.h diff --git a/man/Makefile.am b/man/Makefile.am index 66c207f..4edafaa 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -30,8 +30,6 @@ EXTRA_DIST = @DRIVER_NAME@.man CLEANFILES = $(driverman_DATA) -SED = sed - # Strings to replace in man pages XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 @@ -51,4 +49,4 @@ MAN_SUBSTS = \ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man .man.$(DRIVER_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/src/Makefile.am b/src/Makefile.am index 4f0937e..a5c89ac 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,13 +26,12 @@ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) +AM_CPPFLAGS =-I$(top_srcdir)/include @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version @DRIVER_NAME@_drv_ladir = @inputdir@ -INCLUDES=-I$(top_srcdir)/include/ - @DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c \ @DRIVER_NAME@.h \ emuMB.c \ diff --git a/src/evdev.c b/src/evdev.c index ccea90d..0678edf 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -30,6 +30,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include <xorg-server.h> #include <X11/keysym.h> #include <X11/extensions/XI.h> |