Added support for serial capacitive TabletPCrelease-0.8.1-3

1 files changed, 39 insertions, 0 deletions

diff --git a/configure.in b/configure.in
index d28b09d..5a9c8ae 100644
--- a/configure.in
+++ b/configure.in
@@ -300,6 +300,7 @@ dnl =======================================================
 dnl Check for Xlib
 WCM_CLEVEL=-ansi
 WCM_ENV_XLIB=no
+WCM_ENV_XF86CONFIG=no
 WCM_XLIB_DIR=
 WCM_XSERVER64=
 AC_ARG_WITH(xlib,
@@ -350,6 +351,11 @@ if test "$WCM_ENV_XLIB" = yes; then
 		CFLAGS="$CFLAGS -D__amd64__"
 		WCM_XSERVER64="-D_XSERVER64"
 	fi
+	AC_MSG_CHECKING(for lib xf86config)
+	if test -f $WCM_XLIB_DIR/libxf86config.a -o -f $WCM_XLIB_DIR/libxf86config.so; then
+		AC_MSG_RESULT([found, $WCM_XLIB_DIR])
+		WCM_ENV_XF86CONFIG=yes
+	fi
 fi
 
 dnl =======================================================
@@ -496,6 +502,32 @@ if test "$WCM_ENV_XFREE86" != yes; then
 			AC_DEFINE(WCM_XORG_TABLET_SCALING,1,
 				[Some X.org versions require that the events are scaled to screen size])
 		fi
+		WCM_UNINIT_CALLED=
+		AC_ARG_ENABLE(quirk-Uninit-called,
+			AC_HELP_STRING([--enable-quirk-Uninit-called],
+				[Enable Uninit called [[default=when_needed]]]),
+			WCM_UNINIT_CALLED=$enableval)
+		if test -z "$WCM_UNINIT_CALLED"; then
+			AC_MSG_CHECKING([if Uninit is called])
+			save_CFLAGS="$CFLAGS"
+			CFLAGS="-I$WCM_XORGSDK_DIR $CFLAGS"
+			AC_TRY_COMPILE([
+#include <xorg-server.h>
+#include <xorgVersion.h>
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 4, 0, 0, 0)
+# error "Xserver < 1.4 doesn't call Uninit"
+#elif XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6, 0, 0, 0, 0)
+# error "X.org < 7.3 doesn't call Uninit"
+#endif
+], , [WCM_UNINIT_CALLED=yes], [WCM_UNINIT_CALLED=no])
+			CFLAGS="$save_CFLAGS"
+			AC_MSG_RESULT($WCM_UNINIT_CALLED)
+		fi
+		if test "$WCM_UNINIT_CALLED" = "yes"; then
+			WCM_XDRIVER_QUIRKS="$WCM_XDRIVER_QUIRKS Uninit-called"
+			AC_DEFINE(WCM_XORG_XSERVER_1_4,1,
+				[Xserver versions 1.4 and later call Uninit before closing a device])
+		fi
 		AC_MSG_CHECKING([if Xorg SDK defines IsXExtensionPointer])
 		save_CFLAGS="$CFLAGS"
 		CFLAGS="-I$WCM_XORGSDK_DIR $CFLAGS"
@@ -734,6 +766,12 @@ if test "$enable_libwacomcfg" != no; then
 		WCM_OPTION_LIBWACOMCFG=yes
 		WCM_LIBWACOMCFG_LIBS="-L$WCM_XLIB_DIR -lX11 -lXi"
 		WCM_LIBS="$WCM_LIBS libwacomcfg.la"
+		if test "$WCM_ENV_XF86CONFIG" = yes; then
+			AC_DEFINE(WCM_XF86CONFIG,1,[libxf86config is included])
+			WCM_LIBWACOMCFG_LIBS="-L$WCM_LIBWACOMCFG_LIBS -lxf86config -lm"
+		else
+			AC_DEFINE(WCM_XF86CONFIG,0,[libxf86config isn't included])
+		fi
 	else
 		AC_MSG_WARN([XLib environment missing, libwacomcfg not built])
 	fi
@@ -991,6 +1029,7 @@ echo "           Xorg SDK - $WCM_ENV_XORGSDK $WCM_XORGSDK_DIR"
 echo "          XSERVER64 - $WCM_OPTION_XSERVER64"
 echo "           dlloader - $WCM_OPTION_DLLOADER"
 echo "               XLib - $WCM_ENV_XLIB $WCM_XLIB_DIR"
+echo "         xf86config - $WCM_ENV_XF86CONFIG $WCM_XLIB_DIR"
 echo "                TCL - $WCM_ENV_TCL $WCM_TCL_DIR"
 echo "                 TK - $WCM_ENV_TK $WCM_TK_DIR"
 echo "            ncurses - $WCM_ENV_NCURSES"