XLibre/xf86-input-synaptics
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-synaptics.git synced 2026-03-24 18:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Require recordproto 1.13 or libXtst 1.1 for record support.

Browse Source 
The record.h header used to be in recordproto up to excluding 1.14, then
moved to libXtst. Check for both and enable it dependent on which version we
have.

This avoids build errors on setups where a user updated recordproto but not
libXtst.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Xavier Chantry <shiningxc@gmail.com>
This commit is contained in:
Peter Hutterer
2009-10-06 08:06:37 +10:00
parent 4422003faf
commit 807a0ecd61
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@@ -106,7 +106,14 @@ AC_ARG_ENABLE(tools,
[build_tools="auto"])
if test "x$build_tools" != "xno"; then
PKG_CHECK_MODULES(XRECORD, xtst, AC_DEFINE([HAVE_XRECORD],[],[Use XRecord]), true)
# Record.h is either in recordproto up to 1.13.2 or in libXtst 1.1.
PKG_CHECK_MODULES(XTST_1_1, [xtst >= 1.0.99.1], HAVE_LIBXTST="yes", HAVE_LIBXTST="no")
PKG_CHECK_MODULES(RECORDPROTO_1_13, xtst [recordproto < 1.13.99.1], HAVE_RECORDPROTO="yes", HAVE_RECORDPROTO="no")
if test "x$HAVE_LIBXTST" = "xyes" || test "x$HAVE_RECORDPROTO" = "xyes" ; then
AC_DEFINE([HAVE_XRECORD],[],[Use XRecord])
fi
PKG_CHECK_MODULES(XI, x11 [xi >= 1.2] [xorg-server >= 1.6],
BUILD_TOOLS="yes"; AC_DEFINE(BUILD_TOOLS, 1, "Build synclient and syndaemon"),
BUILD_TOOLS="no";

2
tools/Makefile.am
View File

@@ -29,7 +29,7 @@ synclient_SOURCES = synclient.c
synclient_LDFLAGS = -lm $(XI_LIBS)
syndaemon_SOURCES = syndaemon.c
syndaemon_LDFLAGS = $(XRECORD_LIBS) $(XI_LIBS)
syndaemon_LDFLAGS = $(XTST_1_1_LIBS) $(RECORDPROTO_1_13_LIBS) $(XI_LIBS)
else
all:
@echo "Not building syndaemon and synclient."