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

Now ps2comm and alpscomm backend optional

Browse Source 
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Alexandr Shadchin
2011-02-28 16:38:29 +05:00
committed by Peter Hutterer
parent dce6006f6a
commit cf451f34e3
4 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@@ -98,21 +98,31 @@ AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])
AC_MSG_CHECKING([which optional backends will be build])
case "${host}" in
*linux*)
AC_MSG_RESULT([eventcomm])
AC_MSG_RESULT([ps2comm alpscomm eventcomm])
BUILD_PS2COMM="yes"
BUILD_EVENTCOMM="yes"
AC_DEFINE(BUILD_EVENTCOMM, 1, [Optional backend eventcomm enabled])
;;
*freebsd* | *openbsd* | *netbsd* | *dragonfly*)
AC_MSG_RESULT([psmcomm])
*freebsd* | *netbsd* | *dragonfly*)
AC_MSG_RESULT([ps2comm alpscomm psmcomm])
BUILD_PS2COMM="yes"
BUILD_PSMCOMM="yes"
AC_DEFINE(BUILD_PSMCOMM, 1, [Optional backend psmcomm enabled])
;;
*)
AC_MSG_RESULT([none])
;;
esac
if test "x$BUILD_EVENTCOMM" = xyes; then
AC_DEFINE(BUILD_EVENTCOMM, 1, [Optional backend eventcomm enabled])
fi
if test "x$BUILD_PSMCOMM" = xyes; then
AC_DEFINE(BUILD_PSMCOMM, 1, [Optional backend psmcomm enabled])
fi
if test "x$BUILD_PS2COMM" = xyes; then
AC_DEFINE(BUILD_PS2COMM, 1, [Optional backend ps2comm and alpscomm enabled])
fi
AM_CONDITIONAL([BUILD_EVENTCOMM], [test "x${BUILD_EVENTCOMM}" = "xyes"])
AM_CONDITIONAL([BUILD_PSMCOMM], [test "x${BUILD_PSMCOMM}" = "xyes"])
AM_CONDITIONAL([BUILD_PS2COMM], [test "x${BUILD_PS2COMM}" = "xyes"])
# -----------------------------------------------------------------------------
# Dependencies for synclient and syndaemon

8
src/Makefile.am
View File

@@ -32,11 +32,15 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = $(XORG_CFLAGS)
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c synapticsstr.h \
alpscomm.c \
ps2comm.c ps2comm.h \
synproto.h \
properties.c
if BUILD_PS2COMM
@DRIVER_NAME@_drv_la_SOURCES += \
alpscomm.c \
ps2comm.c ps2comm.h
endif
if BUILD_EVENTCOMM
@DRIVER_NAME@_drv_la_SOURCES += \
eventcomm.c eventcomm.h

2
src/synaptics.c
View File

@@ -146,8 +146,10 @@ const static struct {
#ifdef BUILD_PSMCOMM
{"psm", &psm_proto_operations},
#endif
#ifdef BUILD_PS2COMM
{"psaux", &psaux_proto_operations},
{"alps", &alps_proto_operations},
#endif
{NULL, NULL}
};

5
src/synproto.h
View File

@@ -79,14 +79,15 @@ struct SynapticsProtocolOperations {
void (*ReadDevDimensions)(InputInfoPtr pInfo);
};
#ifdef BUILD_PS2COMM
extern struct SynapticsProtocolOperations psaux_proto_operations;
extern struct SynapticsProtocolOperations alps_proto_operations;
#endif /* BUILD_PS2COMM */
#ifdef BUILD_EVENTCOMM
extern struct SynapticsProtocolOperations event_proto_operations;
#endif /* BUILD_EVENTCOMM */
#ifdef BUILD_PSMCOMM
extern struct SynapticsProtocolOperations psm_proto_operations;
#endif /* BUILD_PSMCOMM */
extern struct SynapticsProtocolOperations alps_proto_operations;
#endif /* _SYNPROTO_H_ */