Hello community,
here is the log from the commit of package x11-input-wacom
checked in at Sat Apr 26 11:40:48 CEST 2008.
--------
--- x11-input-wacom/x11-input-wacom.changes 2008-04-20 13:53:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2008-04-26 08:30:39.031968000 +0200
@@ -1,0 +2,9 @@
+Sat Apr 26 08:40:53 CEST 2008 - sndirsch@suse.de
+
+- update to release 0.8.0
+ * Updated wacom.4x
+ * Update ~/.xsession from wacomcpl for KDE system
+ * Added IsXExtensionKeyboard check for Xserver 1.4 or later in
+ wacomcfg.c
+
+-------------------------------------------------------------------
Old:
----
linuxwacom-0.7.9-11.tar.bz2
New:
----
linuxwacom-0.8.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ x11-input-wacom.spec ++++++
--- /var/tmp/diff_new_pack.o22177/_old 2008-04-26 11:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.o22177/_new 2008-04-26 11:40:35.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package x11-input-wacom (Version 0.7.9)
+# spec file for package x11-input-wacom (Version 0.8.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,11 +20,11 @@
License: GPL v2 or later
Url: http://linuxwacom.sourceforge.net/
Group: System/X11/Utilities
-Version: 0.7.9
-Release: 43
+Version: 0.8.0
+Release: 1
Summary: X11 input module for wacom tablet
Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o
-Source: linuxwacom-%{version}-%{revision}.tar.bz2
+Source: linuxwacom-%{version}.tar.bz2
Patch: linuxwacom-fix-multitouch.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -76,7 +76,7 @@
Ping Cheng
%prep
-%setup -n linuxwacom-%{version}-%{revision}
+%setup -n linuxwacom-%{version}
%patch
%build
@@ -147,6 +147,12 @@
/usr/%_lib/libwacomcfg.so
%changelog
+* Sat Apr 26 2008 sndirsch@suse.de
+- update to release 0.8.0
+ * Updated wacom.4x
+ * Update ~/.xsession from wacomcpl for KDE system
+ * Added IsXExtensionKeyboard check for Xserver 1.4 or later in
+ wacomcfg.c
* Sun Apr 20 2008 sndirsch@suse.de
- update to development releasee 0.7.9-11
* Minor fixes in kernel and wacomcpl
++++++ linuxwacom-0.7.9-11.tar.bz2 -> linuxwacom-0.8.0.tar.bz2 ++++++
++++ 1699 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/autom4te.cache/output.0 new/linuxwacom-0.8.0/autom4te.cache/output.0
--- old/linuxwacom-0.7.9-11/autom4te.cache/output.0 2008-04-12 00:11:29.000000000 +0200
+++ new/linuxwacom-0.8.0/autom4te.cache/output.0 2008-04-25 22:09:33.000000000 +0200
@@ -19369,15 +19369,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-int
-main ()
-{
-
#include
#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4, 3, 0, 0, 0)
# error "XFree86 < 4.3 doesn't support sending keys"
#endif
-int main(int argc, char** argv) {return 0;}
+
+int
+main ()
+{
;
return 0;
@@ -19416,7 +19415,6 @@
CFLAGS="$save_CFLAGS"
echo "$as_me:$LINENO: result: $WCM_SEND_KEYS" >&5
echo "${ECHO_T}$WCM_SEND_KEYS" >&6
-
if test "$WCM_SEND_KEYS" = "yes"; then
WCM_XDRIVER_QUIRKS="$WCM_XDRIVER_QUIRKS key-events"
@@ -19425,6 +19423,12 @@
_ACEOF
fi
+
+
+cat >>confdefs.h <<\_ACEOF
+@%:@define WCM_XINPUTABI_MAJOR 0
+_ACEOF
+
fi
fi
if test "$WCM_ENV_XFREE86" = yes; then
@@ -19446,7 +19450,7 @@
echo "$as_me:$LINENO: checking if XFREE86 defines dixScreenOrigins" >&5
echo $ECHO_N "checking if XFREE86 defines dixScreenOrigins... $ECHO_C" >&6
save_CFLAGS="$CFLAGS"
- CFLAGS="-I$WCM_XFREE86_DIR $CFLAGS"
+ CFLAGS="-I$WCM_XFREE86_DIR/programs/Xserver/include -I$WCM_XFREE86_DIR/include $CFLAGS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19940,6 +19944,139 @@
fi
+ echo "$as_me:$LINENO: checking XInput extension version" >&5
+echo $ECHO_N "checking XInput extension version... $ECHO_C" >&6
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="-I$WCM_XORGSDK_DIR $CFLAGS"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include
+#if ABI_XINPUT_VERSION < SET_ABI_VERSION(1, 0)
+# error "XInput extension < 1.0"
+#endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ WCM_XINPUT_MAJOR=1
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+WCM_XINPUT_MAJOR=0
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test "$WCM_XINPUT_MAJOR" = "0"; then
+ echo "$as_me:$LINENO: result: < 1.0" >&5
+echo "${ECHO_T}< 1.0" >&6
+
+cat >>confdefs.h <<\_ACEOF
+@%:@define WCM_XINPUTABI_MAJOR 0
+_ACEOF
+
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include
+#if ABI_XINPUT_VERSION < SET_ABI_VERSION(2, 0)
+# error "XInput extension < 2.0"
+#endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ WCM_XINPUT_MAJOR=2
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+WCM_XINPUT_MAJOR=1
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test "$WCM_XINPUT_MAJOR" = "1"; then
+ echo "$as_me:$LINENO: result: >= 1.0 && < 2.0" >&5
+echo "${ECHO_T}>= 1.0 && < 2.0" >&6
+
+cat >>confdefs.h <<\_ACEOF
+@%:@define WCM_XINPUTABI_MAJOR 1
+_ACEOF
+
+ else
+ echo "$as_me:$LINENO: result: >= 2.0" >&5
+echo "${ECHO_T}>= 2.0" >&6
+
+cat >>confdefs.h <<\_ACEOF
+@%:@define WCM_XINPUTABI_MAJOR 2
+_ACEOF
+
+ fi
+ fi
+ CFLAGS="$save_CFLAGS"
+
case "$WCM_XORGSDK_VER" in
1.0*|1.1*|1.2*|1.3*)
;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/autom4te.cache/output.1 new/linuxwacom-0.8.0/autom4te.cache/output.1
--- old/linuxwacom-0.7.9-11/autom4te.cache/output.1 2008-04-12 00:11:30.000000000 +0200
+++ new/linuxwacom-0.8.0/autom4te.cache/output.1 2008-04-25 22:09:33.000000000 +0200
@@ -19357,15 +19357,14 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-int
-main ()
-{
-
#include
#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4, 3, 0, 0, 0)
# error "XFree86 < 4.3 doesn't support sending keys"
#endif
-int main(int argc, char** argv) {return 0;}
+
+int
+main ()
+{
;
return 0;
@@ -19404,7 +19403,6 @@
CFLAGS="$save_CFLAGS"
echo "$as_me:$LINENO: result: $WCM_SEND_KEYS" >&5
echo "${ECHO_T}$WCM_SEND_KEYS" >&6
-
if test "$WCM_SEND_KEYS" = "yes"; then
WCM_XDRIVER_QUIRKS="$WCM_XDRIVER_QUIRKS key-events"
@@ -19413,6 +19411,12 @@
_ACEOF
fi
+
+
+cat >>confdefs.h <<\_ACEOF
+@%:@define WCM_XINPUTABI_MAJOR 0
+_ACEOF
+
fi
fi
if test "$WCM_ENV_XFREE86" = yes; then
@@ -19434,7 +19438,7 @@
echo "$as_me:$LINENO: checking if XFREE86 defines dixScreenOrigins" >&5
echo $ECHO_N "checking if XFREE86 defines dixScreenOrigins... $ECHO_C" >&6
save_CFLAGS="$CFLAGS"
- CFLAGS="-I$WCM_XFREE86_DIR $CFLAGS"
+ CFLAGS="-I$WCM_XFREE86_DIR/programs/Xserver/include -I$WCM_XFREE86_DIR/include $CFLAGS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19928,6 +19932,139 @@
fi
+ echo "$as_me:$LINENO: checking XInput extension version" >&5
+echo $ECHO_N "checking XInput extension version... $ECHO_C" >&6
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="-I$WCM_XORGSDK_DIR $CFLAGS"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include
+#if ABI_XINPUT_VERSION < SET_ABI_VERSION(1, 0)
+# error "XInput extension < 1.0"
+#endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ WCM_XINPUT_MAJOR=1
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+WCM_XINPUT_MAJOR=0
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test "$WCM_XINPUT_MAJOR" = "0"; then
+ echo "$as_me:$LINENO: result: < 1.0" >&5
+echo "${ECHO_T}< 1.0" >&6
+
+cat >>confdefs.h <<\_ACEOF
+@%:@define WCM_XINPUTABI_MAJOR 0
+_ACEOF
+
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include
+#if ABI_XINPUT_VERSION < SET_ABI_VERSION(2, 0)
+# error "XInput extension < 2.0"
+#endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ WCM_XINPUT_MAJOR=2
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+WCM_XINPUT_MAJOR=1
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test "$WCM_XINPUT_MAJOR" = "1"; then
+ echo "$as_me:$LINENO: result: >= 1.0 && < 2.0" >&5
+echo "${ECHO_T}>= 1.0 && < 2.0" >&6
+
+cat >>confdefs.h <<\_ACEOF
+@%:@define WCM_XINPUTABI_MAJOR 1
+_ACEOF
+
+ else
+ echo "$as_me:$LINENO: result: >= 2.0" >&5
+echo "${ECHO_T}>= 2.0" >&6
+
+cat >>confdefs.h <<\_ACEOF
+@%:@define WCM_XINPUTABI_MAJOR 2
+_ACEOF
+
+ fi
+ fi
+ CFLAGS="$save_CFLAGS"
+
case "$WCM_XORGSDK_VER" in
1.0*|1.1*|1.2*|1.3*)
;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/autom4te.cache/traces.0 new/linuxwacom-0.8.0/autom4te.cache/traces.0
--- old/linuxwacom-0.7.9-11/autom4te.cache/traces.0 2008-04-12 00:11:29.000000000 +0200
+++ new/linuxwacom-0.8.0/autom4te.cache/traces.0 2008-04-25 22:09:33.000000000 +0200
@@ -9348,29 +9348,32 @@
m4trace:configure.in:335: -1- PKG_CHECK_EXISTS([x11], [pkg_cv_[]Xlib_CFLAGS=`$PKG_CONFIG --[]cflags "x11" 2>/dev/null`], [pkg_failed=yes])
m4trace:configure.in:335: -1- PKG_CHECK_EXISTS([x11], [pkg_cv_[]Xlib_LIBS=`$PKG_CONFIG --[]libs "x11" 2>/dev/null`], [pkg_failed=yes])
m4trace:configure.in:335: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.in:390: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:389: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:390: the top level])
-m4trace:configure.in:397: -1- AC_DEFINE_TRACE_LITERAL([WCM_KEY_SENDING_SUPPORT])
-m4trace:configure.in:397: -1- AH_OUTPUT([WCM_KEY_SENDING_SUPPORT], [/* The X-driver can send key events for a button */
+configure.in:389: the top level])
+m4trace:configure.in:395: -1- AC_DEFINE_TRACE_LITERAL([WCM_KEY_SENDING_SUPPORT])
+m4trace:configure.in:395: -1- AH_OUTPUT([WCM_KEY_SENDING_SUPPORT], [/* The X-driver can send key events for a button */
#undef WCM_KEY_SENDING_SUPPORT])
-m4trace:configure.in:402: -1- AM_CONDITIONAL([WCM_ENV_XFREE86], [true])
-m4trace:configure.in:402: -1- AC_SUBST([WCM_ENV_XFREE86_TRUE])
-m4trace:configure.in:402: -1- AC_SUBST([WCM_ENV_XFREE86_FALSE])
-m4trace:configure.in:403: -1- AC_DEFINE_TRACE_LITERAL([WCM_XFREE86])
-m4trace:configure.in:403: -1- AH_OUTPUT([WCM_XFREE86], [/* Compiling for XFree86 */
+m4trace:configure.in:400: -1- AC_DEFINE_TRACE_LITERAL([WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:400: -1- AH_OUTPUT([WCM_XINPUTABI_MAJOR], [/* Slightly diffent abi in XINPUT >= 1.0 */
+#undef WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:404: -1- AM_CONDITIONAL([WCM_ENV_XFREE86], [true])
+m4trace:configure.in:404: -1- AC_SUBST([WCM_ENV_XFREE86_TRUE])
+m4trace:configure.in:404: -1- AC_SUBST([WCM_ENV_XFREE86_FALSE])
+m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([WCM_XFREE86])
+m4trace:configure.in:405: -1- AH_OUTPUT([WCM_XFREE86], [/* Compiling for XFree86 */
#undef WCM_XFREE86])
-m4trace:configure.in:408: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:410: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:408: the top level])
-m4trace:configure.in:414: -1- AC_DEFINE_TRACE_LITERAL([WCM_HAVE_DIXSCREENORIGINS])
-m4trace:configure.in:414: -1- AH_OUTPUT([WCM_HAVE_DIXSCREENORIGINS], [/* Later XFree86 version uses dixScreenOrigins for screen positions and sizes
+configure.in:410: the top level])
+m4trace:configure.in:416: -1- AC_DEFINE_TRACE_LITERAL([WCM_HAVE_DIXSCREENORIGINS])
+m4trace:configure.in:416: -1- AH_OUTPUT([WCM_HAVE_DIXSCREENORIGINS], [/* Later XFree86 version uses dixScreenOrigins for screen positions and sizes
*/
#undef WCM_HAVE_DIXSCREENORIGINS])
-m4trace:configure.in:417: -1- AM_CONDITIONAL([WCM_ENV_XFREE86], [false])
-m4trace:configure.in:417: -1- AC_SUBST([WCM_ENV_XFREE86_TRUE])
-m4trace:configure.in:417: -1- AC_SUBST([WCM_ENV_XFREE86_FALSE])
-m4trace:configure.in:449: -1- PKG_CHECK_MODULES([XSERVER], [xorg-server], [
+m4trace:configure.in:419: -1- AM_CONDITIONAL([WCM_ENV_XFREE86], [false])
+m4trace:configure.in:419: -1- AC_SUBST([WCM_ENV_XFREE86_TRUE])
+m4trace:configure.in:419: -1- AC_SUBST([WCM_ENV_XFREE86_FALSE])
+m4trace:configure.in:451: -1- PKG_CHECK_MODULES([XSERVER], [xorg-server], [
dnl Found it with pkg-config, use that information
WCM_ENV_XORGSDK=yes
WCM_XORGSDK_DIR="`$PKG_CONFIG --variable=sdkdir xorg-server`"
@@ -9392,158 +9395,173 @@
AC_MSG_RESULT([Tried $WCM_XORGSDK_DEFAULT/include, $WCM_XORGSDK_DEFAULT/include/xorg, and $WCM_XORGSDK_DEFAULT/xc/include])
fi
])
-m4trace:configure.in:449: -1- AC_SUBST([XSERVER_CFLAGS])
-m4trace:configure.in:449: -1- AC_SUBST([XSERVER_LIBS])
-m4trace:configure.in:449: -1- PKG_CHECK_EXISTS([xorg-server], [pkg_cv_[]XSERVER_CFLAGS=`$PKG_CONFIG --[]cflags "xorg-server" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.in:449: -1- PKG_CHECK_EXISTS([xorg-server], [pkg_cv_[]XSERVER_LIBS=`$PKG_CONFIG --[]libs "xorg-server" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.in:449: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.in:460: -1- AC_DEFINE_TRACE_LITERAL([WCM_XORG])
-m4trace:configure.in:460: -1- AH_OUTPUT([WCM_XORG], [/* Compiling for X.org */
+m4trace:configure.in:451: -1- AC_SUBST([XSERVER_CFLAGS])
+m4trace:configure.in:451: -1- AC_SUBST([XSERVER_LIBS])
+m4trace:configure.in:451: -1- PKG_CHECK_EXISTS([xorg-server], [pkg_cv_[]XSERVER_CFLAGS=`$PKG_CONFIG --[]cflags "xorg-server" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.in:451: -1- PKG_CHECK_EXISTS([xorg-server], [pkg_cv_[]XSERVER_LIBS=`$PKG_CONFIG --[]libs "xorg-server" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.in:451: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.in:462: -1- AC_DEFINE_TRACE_LITERAL([WCM_XORG])
+m4trace:configure.in:462: -1- AH_OUTPUT([WCM_XORG], [/* Compiling for X.org */
#undef WCM_XORG])
-m4trace:configure.in:467: -1- AC_DEFINE_TRACE_LITERAL([WCM_NO_LIBCWRAPPER])
-m4trace:configure.in:467: -1- AH_OUTPUT([WCM_NO_LIBCWRAPPER], [/* The xserver have no wraps around libc-functions */
+m4trace:configure.in:469: -1- AC_DEFINE_TRACE_LITERAL([WCM_NO_LIBCWRAPPER])
+m4trace:configure.in:469: -1- AH_OUTPUT([WCM_NO_LIBCWRAPPER], [/* The xserver have no wraps around libc-functions */
#undef WCM_NO_LIBCWRAPPER])
-m4trace:configure.in:473: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+m4trace:configure.in:475: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:473: the top level])
-m4trace:configure.in:487: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+configure.in:475: the top level])
+m4trace:configure.in:489: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:487: the top level])
-m4trace:configure.in:494: -1- AC_DEFINE_TRACE_LITERAL([WCM_XORG_TABLET_SCALING])
-m4trace:configure.in:494: -1- AH_OUTPUT([WCM_XORG_TABLET_SCALING], [/* Some X.org versions require that the events are scaled to screen size */
+configure.in:489: the top level])
+m4trace:configure.in:496: -1- AC_DEFINE_TRACE_LITERAL([WCM_XORG_TABLET_SCALING])
+m4trace:configure.in:496: -1- AH_OUTPUT([WCM_XORG_TABLET_SCALING], [/* Some X.org versions require that the events are scaled to screen size */
#undef WCM_XORG_TABLET_SCALING])
-m4trace:configure.in:504: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:506: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:504: the top level])
-m4trace:configure.in:510: -1- AC_DEFINE_TRACE_LITERAL([WCM_ISXEXTENSIONPOINTER])
-m4trace:configure.in:510: -1- AH_OUTPUT([WCM_ISXEXTENSIONPOINTER], [/* IsXExtensionPointer is only defined in later X.org releases */
+configure.in:506: the top level])
+m4trace:configure.in:512: -1- AC_DEFINE_TRACE_LITERAL([WCM_ISXEXTENSIONPOINTER])
+m4trace:configure.in:512: -1- AH_OUTPUT([WCM_ISXEXTENSIONPOINTER], [/* IsXExtensionPointer is only defined in later X.org releases */
#undef WCM_ISXEXTENSIONPOINTER])
-m4trace:configure.in:515: -1- AC_DEFINE_TRACE_LITERAL([WCM_KEY_SENDING_SUPPORT])
-m4trace:configure.in:515: -1- AH_OUTPUT([WCM_KEY_SENDING_SUPPORT], [/* The X-driver can send key events for a button */
+m4trace:configure.in:517: -1- AC_DEFINE_TRACE_LITERAL([WCM_KEY_SENDING_SUPPORT])
+m4trace:configure.in:517: -1- AH_OUTPUT([WCM_KEY_SENDING_SUPPORT], [/* The X-driver can send key events for a button */
#undef WCM_KEY_SENDING_SUPPORT])
-m4trace:configure.in:522: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:524: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:522: the top level])
-m4trace:configure.in:531: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+configure.in:524: the top level])
+m4trace:configure.in:533: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:531: the top level])
-m4trace:configure.in:542: -1- AC_DEFINE_TRACE_LITERAL([WCM_HAVE_DIXSCREENORIGINS])
-m4trace:configure.in:542: -1- AH_OUTPUT([WCM_HAVE_DIXSCREENORIGINS], [/* Later X.org version uses dixScreenOrigins for screen positions and sizes */
+configure.in:533: the top level])
+m4trace:configure.in:544: -1- AC_DEFINE_TRACE_LITERAL([WCM_HAVE_DIXSCREENORIGINS])
+m4trace:configure.in:544: -1- AH_OUTPUT([WCM_HAVE_DIXSCREENORIGINS], [/* Later X.org version uses dixScreenOrigins for screen positions and sizes */
#undef WCM_HAVE_DIXSCREENORIGINS])
-m4trace:configure.in:556: -1- AM_CONDITIONAL([WCM_ENV_XORGSDK], [test "$WCM_ENV_XORGSDK" = yes])
-m4trace:configure.in:556: -1- AC_SUBST([WCM_ENV_XORGSDK_TRUE])
-m4trace:configure.in:556: -1- AC_SUBST([WCM_ENV_XORGSDK_FALSE])
-m4trace:configure.in:560: -1- AC_PATH_X
-m4trace:configure.in:560: -1- AC_DEFINE_TRACE_LITERAL([X_DISPLAY_MISSING])
-m4trace:configure.in:560: -1- AH_OUTPUT([X_DISPLAY_MISSING], [/* Define to 1 if the X Window System is missing or not being used. */
+m4trace:configure.in:555: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
+configure.in:555: the top level])
+m4trace:configure.in:559: -1- AC_DEFINE_TRACE_LITERAL([WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:559: -1- AH_OUTPUT([WCM_XINPUTABI_MAJOR], [/* Slightly diffent abi in XINPUT >= 1.0 */
+#undef WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:566: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
+configure.in:566: the top level])
+m4trace:configure.in:570: -1- AC_DEFINE_TRACE_LITERAL([WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:570: -1- AH_OUTPUT([WCM_XINPUTABI_MAJOR], [/* Slightly diffent abi in XINPUT >= 1.0 */
+#undef WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:574: -1- AC_DEFINE_TRACE_LITERAL([WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:574: -1- AH_OUTPUT([WCM_XINPUTABI_MAJOR], [/* Slightly diffent abi in XINPUT >= 1.0 */
+#undef WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:590: -1- AM_CONDITIONAL([WCM_ENV_XORGSDK], [test "$WCM_ENV_XORGSDK" = yes])
+m4trace:configure.in:590: -1- AC_SUBST([WCM_ENV_XORGSDK_TRUE])
+m4trace:configure.in:590: -1- AC_SUBST([WCM_ENV_XORGSDK_FALSE])
+m4trace:configure.in:594: -1- AC_PATH_X
+m4trace:configure.in:594: -1- AC_DEFINE_TRACE_LITERAL([X_DISPLAY_MISSING])
+m4trace:configure.in:594: -1- AH_OUTPUT([X_DISPLAY_MISSING], [/* Define to 1 if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([dnet], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([dnet_stub], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([nsl], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([bsd], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([socket], [connect], [X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"], [], [$X_EXTRA_LIBS])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([posix], [remove], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([ipc], [shmat], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([ICE], [IceConnectionNumber], [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], [], [$X_EXTRA_LIBS])
-m4trace:configure.in:560: -1- AC_SUBST([X_CFLAGS])
-m4trace:configure.in:560: -1- AC_SUBST([X_PRE_LIBS])
-m4trace:configure.in:560: -1- AC_SUBST([X_LIBS])
-m4trace:configure.in:560: -1- AC_SUBST([X_EXTRA_LIBS])
-m4trace:configure.in:568: -1- AC_SUBST([TCLSH], [$ac_cv_path_TCLSH])
-m4trace:configure.in:682: -1- AC_DEFINE_TRACE_LITERAL([WCM_ENABLE_NCURSES])
-m4trace:configure.in:682: -1- AH_OUTPUT([WCM_ENABLE_NCURSES], [/* ncurses header files available */
+m4trace:configure.in:594: -1- AC_CHECK_LIB([dnet], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([dnet_stub], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([nsl], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([bsd], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([socket], [connect], [X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"], [], [$X_EXTRA_LIBS])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([posix], [remove], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([ipc], [shmat], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([ICE], [IceConnectionNumber], [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], [], [$X_EXTRA_LIBS])
+m4trace:configure.in:594: -1- AC_SUBST([X_CFLAGS])
+m4trace:configure.in:594: -1- AC_SUBST([X_PRE_LIBS])
+m4trace:configure.in:594: -1- AC_SUBST([X_LIBS])
+m4trace:configure.in:594: -1- AC_SUBST([X_EXTRA_LIBS])
+m4trace:configure.in:602: -1- AC_SUBST([TCLSH], [$ac_cv_path_TCLSH])
+m4trace:configure.in:716: -1- AC_DEFINE_TRACE_LITERAL([WCM_ENABLE_NCURSES])
+m4trace:configure.in:716: -1- AH_OUTPUT([WCM_ENABLE_NCURSES], [/* ncurses header files available */
#undef WCM_ENABLE_NCURSES])
-m4trace:configure.in:683: -1- AM_CONDITIONAL([WCM_ENV_NCURSES], [false])
-m4trace:configure.in:683: -1- AC_SUBST([WCM_ENV_NCURSES_TRUE])
-m4trace:configure.in:683: -1- AC_SUBST([WCM_ENV_NCURSES_FALSE])
-m4trace:configure.in:685: -1- AC_DEFINE_TRACE_LITERAL([WCM_ENABLE_NCURSES])
-m4trace:configure.in:685: -1- AH_OUTPUT([WCM_ENABLE_NCURSES], [/* ncurses header files available */
+m4trace:configure.in:717: -1- AM_CONDITIONAL([WCM_ENV_NCURSES], [false])
+m4trace:configure.in:717: -1- AC_SUBST([WCM_ENV_NCURSES_TRUE])
+m4trace:configure.in:717: -1- AC_SUBST([WCM_ENV_NCURSES_FALSE])
+m4trace:configure.in:719: -1- AC_DEFINE_TRACE_LITERAL([WCM_ENABLE_NCURSES])
+m4trace:configure.in:719: -1- AH_OUTPUT([WCM_ENABLE_NCURSES], [/* ncurses header files available */
#undef WCM_ENABLE_NCURSES])
-m4trace:configure.in:686: -1- AM_CONDITIONAL([WCM_ENV_NCURSES], [true])
-m4trace:configure.in:686: -1- AC_SUBST([WCM_ENV_NCURSES_TRUE])
-m4trace:configure.in:686: -1- AC_SUBST([WCM_ENV_NCURSES_FALSE])
-m4trace:configure.in:694: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:694: the top level])
-m4trace:configure.in:716: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:716: the top level])
-m4trace:configure.in:735: -1- AM_CONDITIONAL([WACOMXI_INSTALL], [test "$WCM_OPTION_LIBWACOMXI" = yes ])
-m4trace:configure.in:735: -1- AC_SUBST([WACOMXI_INSTALL_TRUE])
-m4trace:configure.in:735: -1- AC_SUBST([WACOMXI_INSTALL_FALSE])
-m4trace:configure.in:742: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:742: the top level])
-m4trace:configure.in:760: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:760: the top level])
-m4trace:configure.in:785: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+m4trace:configure.in:720: -1- AM_CONDITIONAL([WCM_ENV_NCURSES], [true])
+m4trace:configure.in:720: -1- AC_SUBST([WCM_ENV_NCURSES_TRUE])
+m4trace:configure.in:720: -1- AC_SUBST([WCM_ENV_NCURSES_FALSE])
+m4trace:configure.in:728: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
+configure.in:728: the top level])
+m4trace:configure.in:750: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
+configure.in:750: the top level])
+m4trace:configure.in:769: -1- AM_CONDITIONAL([WACOMXI_INSTALL], [test "$WCM_OPTION_LIBWACOMXI" = yes ])
+m4trace:configure.in:769: -1- AC_SUBST([WACOMXI_INSTALL_TRUE])
+m4trace:configure.in:769: -1- AC_SUBST([WACOMXI_INSTALL_FALSE])
+m4trace:configure.in:776: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:785: the top level])
-m4trace:configure.in:804: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+configure.in:776: the top level])
+m4trace:configure.in:794: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:804: the top level])
+configure.in:794: the top level])
m4trace:configure.in:819: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
configure.in:819: the top level])
-m4trace:configure.in:829: -1- AM_CONDITIONAL([WCM_DLLOADER], [test "$WCM_OPTION_DLLOADER" == "yes"])
-m4trace:configure.in:829: -1- AC_SUBST([WCM_DLLOADER_TRUE])
-m4trace:configure.in:829: -1- AC_SUBST([WCM_DLLOADER_FALSE])
-m4trace:configure.in:836: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+m4trace:configure.in:838: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:836: the top level])
-m4trace:configure.in:859: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+configure.in:838: the top level])
+m4trace:configure.in:853: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
+configure.in:853: the top level])
+m4trace:configure.in:863: -1- AM_CONDITIONAL([WCM_DLLOADER], [test "$WCM_OPTION_DLLOADER" == "yes"])
+m4trace:configure.in:863: -1- AC_SUBST([WCM_DLLOADER_TRUE])
+m4trace:configure.in:863: -1- AC_SUBST([WCM_DLLOADER_FALSE])
+m4trace:configure.in:870: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:859: the top level])
-m4trace:configure.in:870: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
configure.in:870: the top level])
-m4trace:configure.in:876: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:893: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
+configure.in:893: the top level])
+m4trace:configure.in:904: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
+configure.in:904: the top level])
+m4trace:configure.in:910: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:876: the top level])
-m4trace:configure.in:882: -1- AC_DEFINE_TRACE_LITERAL([IN_MODULE])
-m4trace:configure.in:882: -1- AH_OUTPUT([IN_MODULE], [/* cmdline substitute */
+configure.in:910: the top level])
+m4trace:configure.in:916: -1- AC_DEFINE_TRACE_LITERAL([IN_MODULE])
+m4trace:configure.in:916: -1- AH_OUTPUT([IN_MODULE], [/* cmdline substitute */
#undef IN_MODULE])
-m4trace:configure.in:883: -1- AC_DEFINE_TRACE_LITERAL([XFree86LOADER])
-m4trace:configure.in:883: -1- AH_OUTPUT([XFree86LOADER], [/* cmdline substitute */
+m4trace:configure.in:917: -1- AC_DEFINE_TRACE_LITERAL([XFree86LOADER])
+m4trace:configure.in:917: -1- AH_OUTPUT([XFree86LOADER], [/* cmdline substitute */
#undef XFree86LOADER])
-m4trace:configure.in:884: -1- AC_DEFINE_TRACE_LITERAL([XINPUT])
-m4trace:configure.in:884: -1- AH_OUTPUT([XINPUT], [/* cmdline substitute */
+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([XINPUT])
+m4trace:configure.in:918: -1- AH_OUTPUT([XINPUT], [/* cmdline substitute */
#undef XINPUT])
-m4trace:configure.in:885: -1- AC_DEFINE_TRACE_LITERAL([XKB])
-m4trace:configure.in:885: -1- AH_OUTPUT([XKB], [/* cmdline substitute */
+m4trace:configure.in:919: -1- AC_DEFINE_TRACE_LITERAL([XKB])
+m4trace:configure.in:919: -1- AH_OUTPUT([XKB], [/* cmdline substitute */
#undef XKB])
-m4trace:configure.in:890: -1- AC_SUBST([WCM_PROGS])
-m4trace:configure.in:891: -1- AC_SUBST([WCM_LIBS])
-m4trace:configure.in:892: -1- AC_SUBST([WCM_TCLLIBS])
-m4trace:configure.in:893: -1- AC_SUBST([WCM_TCLPKGS])
-m4trace:configure.in:894: -1- AC_SUBST([WCM_MODULES])
-m4trace:configure.in:895: -1- AC_SUBST([WCM_XF86MODULES])
-m4trace:configure.in:896: -1- AC_SUBST([WCM_ARCH])
-m4trace:configure.in:897: -1- AC_SUBST([WCM_KSTACK])
-m4trace:configure.in:898: -1- AC_SUBST([WCM_MODVER])
-m4trace:configure.in:899: -1- AC_SUBST([WCM_KERNEL_DIR])
-m4trace:configure.in:900: -1- AC_SUBST([WCM_KERNEL_VER])
-m4trace:configure.in:901: -1- AC_SUBST([WCM_XFREE86_DIR])
-m4trace:configure.in:902: -1- AC_SUBST([WCM_XORGSDK_DIR])
-m4trace:configure.in:903: -1- AC_SUBST([WCM_MODDIR])
-m4trace:configure.in:904: -1- AC_SUBST([WCM_XSERVER64])
-m4trace:configure.in:905: -1- AC_SUBST([WCM_NO_MERGE_CONSTANTS])
-m4trace:configure.in:906: -1- AC_SUBST([WCM_NO_STACK_PROTECTOR])
-m4trace:configure.in:907: -1- AC_SUBST([WCM_CLEVEL])
-m4trace:configure.in:908: -1- AC_SUBST([WCM_XIDUMP_LIBS])
-m4trace:configure.in:909: -1- AC_SUBST([WCM_LIBWACOMCFG_LIBS])
-m4trace:configure.in:910: -1- AC_SUBST([WCM_WACOMXI_LIBS])
-m4trace:configure.in:911: -1- AC_SUBST([WCM_PREFIX])
-m4trace:configure.in:912: -1- AC_SUBST([WCM_XSETWACOM_LIBS])
-m4trace:configure.in:913: -1- AC_SUBST([WCM_DEPFLAGS])
-m4trace:configure.in:914: -1- AC_SUBST([WCM_OPTION_WACOM])
-m4trace:configure.in:915: -1- AC_SUBST([WCM_OPTION_HID])
-m4trace:configure.in:916: -1- AC_SUBST([WCM_OPTION_EVDEV])
-m4trace:configure.in:917: -1- AC_SUBST([WCM_OPTION_MOUSEDEV])
-m4trace:configure.in:918: -1- AC_SUBST([WCM_OPTION_USBMOUSE])
-m4trace:configure.in:919: -1- AC_SUBST([WCM_OPTION_INPUT])
-m4trace:configure.in:941: -1- AC_CONFIG_FILES([Makefile
+m4trace:configure.in:924: -1- AC_SUBST([WCM_PROGS])
+m4trace:configure.in:925: -1- AC_SUBST([WCM_LIBS])
+m4trace:configure.in:926: -1- AC_SUBST([WCM_TCLLIBS])
+m4trace:configure.in:927: -1- AC_SUBST([WCM_TCLPKGS])
+m4trace:configure.in:928: -1- AC_SUBST([WCM_MODULES])
+m4trace:configure.in:929: -1- AC_SUBST([WCM_XF86MODULES])
+m4trace:configure.in:930: -1- AC_SUBST([WCM_ARCH])
+m4trace:configure.in:931: -1- AC_SUBST([WCM_KSTACK])
+m4trace:configure.in:932: -1- AC_SUBST([WCM_MODVER])
+m4trace:configure.in:933: -1- AC_SUBST([WCM_KERNEL_DIR])
+m4trace:configure.in:934: -1- AC_SUBST([WCM_KERNEL_VER])
+m4trace:configure.in:935: -1- AC_SUBST([WCM_XFREE86_DIR])
+m4trace:configure.in:936: -1- AC_SUBST([WCM_XORGSDK_DIR])
+m4trace:configure.in:937: -1- AC_SUBST([WCM_MODDIR])
+m4trace:configure.in:938: -1- AC_SUBST([WCM_XSERVER64])
+m4trace:configure.in:939: -1- AC_SUBST([WCM_NO_MERGE_CONSTANTS])
+m4trace:configure.in:940: -1- AC_SUBST([WCM_NO_STACK_PROTECTOR])
+m4trace:configure.in:941: -1- AC_SUBST([WCM_CLEVEL])
+m4trace:configure.in:942: -1- AC_SUBST([WCM_XIDUMP_LIBS])
+m4trace:configure.in:943: -1- AC_SUBST([WCM_LIBWACOMCFG_LIBS])
+m4trace:configure.in:944: -1- AC_SUBST([WCM_WACOMXI_LIBS])
+m4trace:configure.in:945: -1- AC_SUBST([WCM_PREFIX])
+m4trace:configure.in:946: -1- AC_SUBST([WCM_XSETWACOM_LIBS])
+m4trace:configure.in:947: -1- AC_SUBST([WCM_DEPFLAGS])
+m4trace:configure.in:948: -1- AC_SUBST([WCM_OPTION_WACOM])
+m4trace:configure.in:949: -1- AC_SUBST([WCM_OPTION_HID])
+m4trace:configure.in:950: -1- AC_SUBST([WCM_OPTION_EVDEV])
+m4trace:configure.in:951: -1- AC_SUBST([WCM_OPTION_MOUSEDEV])
+m4trace:configure.in:952: -1- AC_SUBST([WCM_OPTION_USBMOUSE])
+m4trace:configure.in:953: -1- AC_SUBST([WCM_OPTION_INPUT])
+m4trace:configure.in:975: -1- AC_CONFIG_FILES([Makefile
mkxincludes
src/Makefile
src/util/Makefile
@@ -9564,9 +9582,9 @@
src/2.6.24/Makefile
src/wacomxi/Makefile
src/wacomxi/wacomcpl])
-m4trace:configure.in:941: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.in:975: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
You should run autoupdate.], [])
-m4trace:configure.in:941: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.in:941: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.in:941: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file])
-m4trace:configure.in:941: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.in:975: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.in:975: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.in:975: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file])
+m4trace:configure.in:975: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/autom4te.cache/traces.1 new/linuxwacom-0.8.0/autom4te.cache/traces.1
--- old/linuxwacom-0.7.9-11/autom4te.cache/traces.1 2008-04-12 00:11:29.000000000 +0200
+++ new/linuxwacom-0.8.0/autom4te.cache/traces.1 2008-04-25 22:09:33.000000000 +0200
@@ -444,177 +444,195 @@
#undef WCM_PATCH_DRVALUE])
m4trace:configure.in:335: -1- AC_SUBST([Xlib_CFLAGS])
m4trace:configure.in:335: -1- AC_SUBST([Xlib_LIBS])
-m4trace:configure.in:390: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:389: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:390: the top level])
-m4trace:configure.in:397: -1- AC_DEFINE_TRACE_LITERAL([WCM_KEY_SENDING_SUPPORT])
-m4trace:configure.in:397: -1- AH_OUTPUT([WCM_KEY_SENDING_SUPPORT], [/* The X-driver can send key events for a button */
+configure.in:389: the top level])
+m4trace:configure.in:395: -1- AC_DEFINE_TRACE_LITERAL([WCM_KEY_SENDING_SUPPORT])
+m4trace:configure.in:395: -1- AH_OUTPUT([WCM_KEY_SENDING_SUPPORT], [/* The X-driver can send key events for a button */
#undef WCM_KEY_SENDING_SUPPORT])
-m4trace:configure.in:402: -1- AM_CONDITIONAL([WCM_ENV_XFREE86], [true])
-m4trace:configure.in:402: -1- AC_SUBST([WCM_ENV_XFREE86_TRUE])
-m4trace:configure.in:402: -1- AC_SUBST([WCM_ENV_XFREE86_FALSE])
-m4trace:configure.in:403: -1- AC_DEFINE_TRACE_LITERAL([WCM_XFREE86])
-m4trace:configure.in:403: -1- AH_OUTPUT([WCM_XFREE86], [/* Compiling for XFree86 */
+m4trace:configure.in:400: -1- AC_DEFINE_TRACE_LITERAL([WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:400: -1- AH_OUTPUT([WCM_XINPUTABI_MAJOR], [/* Slightly diffent abi in XINPUT >= 1.0 */
+#undef WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:404: -1- AM_CONDITIONAL([WCM_ENV_XFREE86], [true])
+m4trace:configure.in:404: -1- AC_SUBST([WCM_ENV_XFREE86_TRUE])
+m4trace:configure.in:404: -1- AC_SUBST([WCM_ENV_XFREE86_FALSE])
+m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([WCM_XFREE86])
+m4trace:configure.in:405: -1- AH_OUTPUT([WCM_XFREE86], [/* Compiling for XFree86 */
#undef WCM_XFREE86])
-m4trace:configure.in:408: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:410: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:408: the top level])
-m4trace:configure.in:414: -1- AC_DEFINE_TRACE_LITERAL([WCM_HAVE_DIXSCREENORIGINS])
-m4trace:configure.in:414: -1- AH_OUTPUT([WCM_HAVE_DIXSCREENORIGINS], [/* Later XFree86 version uses dixScreenOrigins for screen positions and sizes
+configure.in:410: the top level])
+m4trace:configure.in:416: -1- AC_DEFINE_TRACE_LITERAL([WCM_HAVE_DIXSCREENORIGINS])
+m4trace:configure.in:416: -1- AH_OUTPUT([WCM_HAVE_DIXSCREENORIGINS], [/* Later XFree86 version uses dixScreenOrigins for screen positions and sizes
*/
#undef WCM_HAVE_DIXSCREENORIGINS])
-m4trace:configure.in:417: -1- AM_CONDITIONAL([WCM_ENV_XFREE86], [false])
-m4trace:configure.in:417: -1- AC_SUBST([WCM_ENV_XFREE86_TRUE])
-m4trace:configure.in:417: -1- AC_SUBST([WCM_ENV_XFREE86_FALSE])
-m4trace:configure.in:449: -1- AC_SUBST([XSERVER_CFLAGS])
-m4trace:configure.in:449: -1- AC_SUBST([XSERVER_LIBS])
-m4trace:configure.in:460: -1- AC_DEFINE_TRACE_LITERAL([WCM_XORG])
-m4trace:configure.in:460: -1- AH_OUTPUT([WCM_XORG], [/* Compiling for X.org */
+m4trace:configure.in:419: -1- AM_CONDITIONAL([WCM_ENV_XFREE86], [false])
+m4trace:configure.in:419: -1- AC_SUBST([WCM_ENV_XFREE86_TRUE])
+m4trace:configure.in:419: -1- AC_SUBST([WCM_ENV_XFREE86_FALSE])
+m4trace:configure.in:451: -1- AC_SUBST([XSERVER_CFLAGS])
+m4trace:configure.in:451: -1- AC_SUBST([XSERVER_LIBS])
+m4trace:configure.in:462: -1- AC_DEFINE_TRACE_LITERAL([WCM_XORG])
+m4trace:configure.in:462: -1- AH_OUTPUT([WCM_XORG], [/* Compiling for X.org */
#undef WCM_XORG])
-m4trace:configure.in:467: -1- AC_DEFINE_TRACE_LITERAL([WCM_NO_LIBCWRAPPER])
-m4trace:configure.in:467: -1- AH_OUTPUT([WCM_NO_LIBCWRAPPER], [/* The xserver have no wraps around libc-functions */
+m4trace:configure.in:469: -1- AC_DEFINE_TRACE_LITERAL([WCM_NO_LIBCWRAPPER])
+m4trace:configure.in:469: -1- AH_OUTPUT([WCM_NO_LIBCWRAPPER], [/* The xserver have no wraps around libc-functions */
#undef WCM_NO_LIBCWRAPPER])
-m4trace:configure.in:473: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+m4trace:configure.in:475: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:473: the top level])
-m4trace:configure.in:487: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+configure.in:475: the top level])
+m4trace:configure.in:489: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:487: the top level])
-m4trace:configure.in:494: -1- AC_DEFINE_TRACE_LITERAL([WCM_XORG_TABLET_SCALING])
-m4trace:configure.in:494: -1- AH_OUTPUT([WCM_XORG_TABLET_SCALING], [/* Some X.org versions require that the events are scaled to screen size */
+configure.in:489: the top level])
+m4trace:configure.in:496: -1- AC_DEFINE_TRACE_LITERAL([WCM_XORG_TABLET_SCALING])
+m4trace:configure.in:496: -1- AH_OUTPUT([WCM_XORG_TABLET_SCALING], [/* Some X.org versions require that the events are scaled to screen size */
#undef WCM_XORG_TABLET_SCALING])
-m4trace:configure.in:504: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:506: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:504: the top level])
-m4trace:configure.in:510: -1- AC_DEFINE_TRACE_LITERAL([WCM_ISXEXTENSIONPOINTER])
-m4trace:configure.in:510: -1- AH_OUTPUT([WCM_ISXEXTENSIONPOINTER], [/* IsXExtensionPointer is only defined in later X.org releases */
+configure.in:506: the top level])
+m4trace:configure.in:512: -1- AC_DEFINE_TRACE_LITERAL([WCM_ISXEXTENSIONPOINTER])
+m4trace:configure.in:512: -1- AH_OUTPUT([WCM_ISXEXTENSIONPOINTER], [/* IsXExtensionPointer is only defined in later X.org releases */
#undef WCM_ISXEXTENSIONPOINTER])
-m4trace:configure.in:515: -1- AC_DEFINE_TRACE_LITERAL([WCM_KEY_SENDING_SUPPORT])
-m4trace:configure.in:515: -1- AH_OUTPUT([WCM_KEY_SENDING_SUPPORT], [/* The X-driver can send key events for a button */
+m4trace:configure.in:517: -1- AC_DEFINE_TRACE_LITERAL([WCM_KEY_SENDING_SUPPORT])
+m4trace:configure.in:517: -1- AH_OUTPUT([WCM_KEY_SENDING_SUPPORT], [/* The X-driver can send key events for a button */
#undef WCM_KEY_SENDING_SUPPORT])
-m4trace:configure.in:522: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:524: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:522: the top level])
-m4trace:configure.in:531: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+configure.in:524: the top level])
+m4trace:configure.in:533: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:531: the top level])
-m4trace:configure.in:542: -1- AC_DEFINE_TRACE_LITERAL([WCM_HAVE_DIXSCREENORIGINS])
-m4trace:configure.in:542: -1- AH_OUTPUT([WCM_HAVE_DIXSCREENORIGINS], [/* Later X.org version uses dixScreenOrigins for screen positions and sizes */
+configure.in:533: the top level])
+m4trace:configure.in:544: -1- AC_DEFINE_TRACE_LITERAL([WCM_HAVE_DIXSCREENORIGINS])
+m4trace:configure.in:544: -1- AH_OUTPUT([WCM_HAVE_DIXSCREENORIGINS], [/* Later X.org version uses dixScreenOrigins for screen positions and sizes */
#undef WCM_HAVE_DIXSCREENORIGINS])
-m4trace:configure.in:556: -1- AM_CONDITIONAL([WCM_ENV_XORGSDK], [test "$WCM_ENV_XORGSDK" = yes])
-m4trace:configure.in:556: -1- AC_SUBST([WCM_ENV_XORGSDK_TRUE])
-m4trace:configure.in:556: -1- AC_SUBST([WCM_ENV_XORGSDK_FALSE])
-m4trace:configure.in:560: -1- AC_PATH_X
-m4trace:configure.in:560: -1- AC_DEFINE_TRACE_LITERAL([X_DISPLAY_MISSING])
-m4trace:configure.in:560: -1- AH_OUTPUT([X_DISPLAY_MISSING], [/* Define to 1 if the X Window System is missing or not being used. */
+m4trace:configure.in:555: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
+configure.in:555: the top level])
+m4trace:configure.in:559: -1- AC_DEFINE_TRACE_LITERAL([WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:559: -1- AH_OUTPUT([WCM_XINPUTABI_MAJOR], [/* Slightly diffent abi in XINPUT >= 1.0 */
+#undef WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:566: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
+configure.in:566: the top level])
+m4trace:configure.in:570: -1- AC_DEFINE_TRACE_LITERAL([WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:570: -1- AH_OUTPUT([WCM_XINPUTABI_MAJOR], [/* Slightly diffent abi in XINPUT >= 1.0 */
+#undef WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:574: -1- AC_DEFINE_TRACE_LITERAL([WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:574: -1- AH_OUTPUT([WCM_XINPUTABI_MAJOR], [/* Slightly diffent abi in XINPUT >= 1.0 */
+#undef WCM_XINPUTABI_MAJOR])
+m4trace:configure.in:590: -1- AM_CONDITIONAL([WCM_ENV_XORGSDK], [test "$WCM_ENV_XORGSDK" = yes])
+m4trace:configure.in:590: -1- AC_SUBST([WCM_ENV_XORGSDK_TRUE])
+m4trace:configure.in:590: -1- AC_SUBST([WCM_ENV_XORGSDK_FALSE])
+m4trace:configure.in:594: -1- AC_PATH_X
+m4trace:configure.in:594: -1- AC_DEFINE_TRACE_LITERAL([X_DISPLAY_MISSING])
+m4trace:configure.in:594: -1- AH_OUTPUT([X_DISPLAY_MISSING], [/* Define to 1 if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([dnet], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([dnet_stub], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([nsl], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([bsd], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([socket], [connect], [X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"], [], [$X_EXTRA_LIBS])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([posix], [remove], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([ipc], [shmat], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"])
-m4trace:configure.in:560: -1- AC_CHECK_LIB([ICE], [IceConnectionNumber], [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], [], [$X_EXTRA_LIBS])
-m4trace:configure.in:560: -1- AC_SUBST([X_CFLAGS])
-m4trace:configure.in:560: -1- AC_SUBST([X_PRE_LIBS])
-m4trace:configure.in:560: -1- AC_SUBST([X_LIBS])
-m4trace:configure.in:560: -1- AC_SUBST([X_EXTRA_LIBS])
-m4trace:configure.in:568: -1- AC_SUBST([TCLSH], [$ac_cv_path_TCLSH])
-m4trace:configure.in:682: -1- AC_DEFINE_TRACE_LITERAL([WCM_ENABLE_NCURSES])
-m4trace:configure.in:682: -1- AH_OUTPUT([WCM_ENABLE_NCURSES], [/* ncurses header files available */
+m4trace:configure.in:594: -1- AC_CHECK_LIB([dnet], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([dnet_stub], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([nsl], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([bsd], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([socket], [connect], [X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"], [], [$X_EXTRA_LIBS])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([posix], [remove], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([ipc], [shmat], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"])
+m4trace:configure.in:594: -1- AC_CHECK_LIB([ICE], [IceConnectionNumber], [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], [], [$X_EXTRA_LIBS])
+m4trace:configure.in:594: -1- AC_SUBST([X_CFLAGS])
+m4trace:configure.in:594: -1- AC_SUBST([X_PRE_LIBS])
+m4trace:configure.in:594: -1- AC_SUBST([X_LIBS])
+m4trace:configure.in:594: -1- AC_SUBST([X_EXTRA_LIBS])
+m4trace:configure.in:602: -1- AC_SUBST([TCLSH], [$ac_cv_path_TCLSH])
+m4trace:configure.in:716: -1- AC_DEFINE_TRACE_LITERAL([WCM_ENABLE_NCURSES])
+m4trace:configure.in:716: -1- AH_OUTPUT([WCM_ENABLE_NCURSES], [/* ncurses header files available */
#undef WCM_ENABLE_NCURSES])
-m4trace:configure.in:683: -1- AM_CONDITIONAL([WCM_ENV_NCURSES], [false])
-m4trace:configure.in:683: -1- AC_SUBST([WCM_ENV_NCURSES_TRUE])
-m4trace:configure.in:683: -1- AC_SUBST([WCM_ENV_NCURSES_FALSE])
-m4trace:configure.in:685: -1- AC_DEFINE_TRACE_LITERAL([WCM_ENABLE_NCURSES])
-m4trace:configure.in:685: -1- AH_OUTPUT([WCM_ENABLE_NCURSES], [/* ncurses header files available */
+m4trace:configure.in:717: -1- AM_CONDITIONAL([WCM_ENV_NCURSES], [false])
+m4trace:configure.in:717: -1- AC_SUBST([WCM_ENV_NCURSES_TRUE])
+m4trace:configure.in:717: -1- AC_SUBST([WCM_ENV_NCURSES_FALSE])
+m4trace:configure.in:719: -1- AC_DEFINE_TRACE_LITERAL([WCM_ENABLE_NCURSES])
+m4trace:configure.in:719: -1- AH_OUTPUT([WCM_ENABLE_NCURSES], [/* ncurses header files available */
#undef WCM_ENABLE_NCURSES])
-m4trace:configure.in:686: -1- AM_CONDITIONAL([WCM_ENV_NCURSES], [true])
-m4trace:configure.in:686: -1- AC_SUBST([WCM_ENV_NCURSES_TRUE])
-m4trace:configure.in:686: -1- AC_SUBST([WCM_ENV_NCURSES_FALSE])
-m4trace:configure.in:694: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:694: the top level])
-m4trace:configure.in:716: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:716: the top level])
-m4trace:configure.in:735: -1- AM_CONDITIONAL([WACOMXI_INSTALL], [test "$WCM_OPTION_LIBWACOMXI" = yes ])
-m4trace:configure.in:735: -1- AC_SUBST([WACOMXI_INSTALL_TRUE])
-m4trace:configure.in:735: -1- AC_SUBST([WACOMXI_INSTALL_FALSE])
-m4trace:configure.in:742: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:742: the top level])
-m4trace:configure.in:760: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:760: the top level])
-m4trace:configure.in:785: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+m4trace:configure.in:720: -1- AM_CONDITIONAL([WCM_ENV_NCURSES], [true])
+m4trace:configure.in:720: -1- AC_SUBST([WCM_ENV_NCURSES_TRUE])
+m4trace:configure.in:720: -1- AC_SUBST([WCM_ENV_NCURSES_FALSE])
+m4trace:configure.in:728: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
+configure.in:728: the top level])
+m4trace:configure.in:750: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
+configure.in:750: the top level])
+m4trace:configure.in:769: -1- AM_CONDITIONAL([WACOMXI_INSTALL], [test "$WCM_OPTION_LIBWACOMXI" = yes ])
+m4trace:configure.in:769: -1- AC_SUBST([WACOMXI_INSTALL_TRUE])
+m4trace:configure.in:769: -1- AC_SUBST([WACOMXI_INSTALL_FALSE])
+m4trace:configure.in:776: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:785: the top level])
-m4trace:configure.in:804: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+configure.in:776: the top level])
+m4trace:configure.in:794: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:804: the top level])
+configure.in:794: the top level])
m4trace:configure.in:819: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
configure.in:819: the top level])
-m4trace:configure.in:829: -1- AM_CONDITIONAL([WCM_DLLOADER], [test "$WCM_OPTION_DLLOADER" == "yes"])
-m4trace:configure.in:829: -1- AC_SUBST([WCM_DLLOADER_TRUE])
-m4trace:configure.in:829: -1- AC_SUBST([WCM_DLLOADER_FALSE])
-m4trace:configure.in:836: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+m4trace:configure.in:838: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:836: the top level])
-m4trace:configure.in:859: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+configure.in:838: the top level])
+m4trace:configure.in:853: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
+configure.in:853: the top level])
+m4trace:configure.in:863: -1- AM_CONDITIONAL([WCM_DLLOADER], [test "$WCM_OPTION_DLLOADER" == "yes"])
+m4trace:configure.in:863: -1- AC_SUBST([WCM_DLLOADER_TRUE])
+m4trace:configure.in:863: -1- AC_SUBST([WCM_DLLOADER_FALSE])
+m4trace:configure.in:870: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
-configure.in:859: the top level])
-m4trace:configure.in:870: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
configure.in:870: the top level])
-m4trace:configure.in:876: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:893: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
+configure.in:893: the top level])
+m4trace:configure.in:904: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
+configure.in:904: the top level])
+m4trace:configure.in:910: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-configure.in:876: the top level])
-m4trace:configure.in:882: -1- AC_DEFINE_TRACE_LITERAL([IN_MODULE])
-m4trace:configure.in:882: -1- AH_OUTPUT([IN_MODULE], [/* cmdline substitute */
+configure.in:910: the top level])
+m4trace:configure.in:916: -1- AC_DEFINE_TRACE_LITERAL([IN_MODULE])
+m4trace:configure.in:916: -1- AH_OUTPUT([IN_MODULE], [/* cmdline substitute */
#undef IN_MODULE])
-m4trace:configure.in:883: -1- AC_DEFINE_TRACE_LITERAL([XFree86LOADER])
-m4trace:configure.in:883: -1- AH_OUTPUT([XFree86LOADER], [/* cmdline substitute */
+m4trace:configure.in:917: -1- AC_DEFINE_TRACE_LITERAL([XFree86LOADER])
+m4trace:configure.in:917: -1- AH_OUTPUT([XFree86LOADER], [/* cmdline substitute */
#undef XFree86LOADER])
-m4trace:configure.in:884: -1- AC_DEFINE_TRACE_LITERAL([XINPUT])
-m4trace:configure.in:884: -1- AH_OUTPUT([XINPUT], [/* cmdline substitute */
+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([XINPUT])
+m4trace:configure.in:918: -1- AH_OUTPUT([XINPUT], [/* cmdline substitute */
#undef XINPUT])
-m4trace:configure.in:885: -1- AC_DEFINE_TRACE_LITERAL([XKB])
-m4trace:configure.in:885: -1- AH_OUTPUT([XKB], [/* cmdline substitute */
+m4trace:configure.in:919: -1- AC_DEFINE_TRACE_LITERAL([XKB])
+m4trace:configure.in:919: -1- AH_OUTPUT([XKB], [/* cmdline substitute */
#undef XKB])
-m4trace:configure.in:890: -1- AC_SUBST([WCM_PROGS])
-m4trace:configure.in:891: -1- AC_SUBST([WCM_LIBS])
-m4trace:configure.in:892: -1- AC_SUBST([WCM_TCLLIBS])
-m4trace:configure.in:893: -1- AC_SUBST([WCM_TCLPKGS])
-m4trace:configure.in:894: -1- AC_SUBST([WCM_MODULES])
-m4trace:configure.in:895: -1- AC_SUBST([WCM_XF86MODULES])
-m4trace:configure.in:896: -1- AC_SUBST([WCM_ARCH])
-m4trace:configure.in:897: -1- AC_SUBST([WCM_KSTACK])
-m4trace:configure.in:898: -1- AC_SUBST([WCM_MODVER])
-m4trace:configure.in:899: -1- AC_SUBST([WCM_KERNEL_DIR])
-m4trace:configure.in:900: -1- AC_SUBST([WCM_KERNEL_VER])
-m4trace:configure.in:901: -1- AC_SUBST([WCM_XFREE86_DIR])
-m4trace:configure.in:902: -1- AC_SUBST([WCM_XORGSDK_DIR])
-m4trace:configure.in:903: -1- AC_SUBST([WCM_MODDIR])
-m4trace:configure.in:904: -1- AC_SUBST([WCM_XSERVER64])
-m4trace:configure.in:905: -1- AC_SUBST([WCM_NO_MERGE_CONSTANTS])
-m4trace:configure.in:906: -1- AC_SUBST([WCM_NO_STACK_PROTECTOR])
-m4trace:configure.in:907: -1- AC_SUBST([WCM_CLEVEL])
-m4trace:configure.in:908: -1- AC_SUBST([WCM_XIDUMP_LIBS])
-m4trace:configure.in:909: -1- AC_SUBST([WCM_LIBWACOMCFG_LIBS])
-m4trace:configure.in:910: -1- AC_SUBST([WCM_WACOMXI_LIBS])
-m4trace:configure.in:911: -1- AC_SUBST([WCM_PREFIX])
-m4trace:configure.in:912: -1- AC_SUBST([WCM_XSETWACOM_LIBS])
-m4trace:configure.in:913: -1- AC_SUBST([WCM_DEPFLAGS])
-m4trace:configure.in:914: -1- AC_SUBST([WCM_OPTION_WACOM])
-m4trace:configure.in:915: -1- AC_SUBST([WCM_OPTION_HID])
-m4trace:configure.in:916: -1- AC_SUBST([WCM_OPTION_EVDEV])
-m4trace:configure.in:917: -1- AC_SUBST([WCM_OPTION_MOUSEDEV])
-m4trace:configure.in:918: -1- AC_SUBST([WCM_OPTION_USBMOUSE])
-m4trace:configure.in:919: -1- AC_SUBST([WCM_OPTION_INPUT])
-m4trace:configure.in:941: -1- AC_CONFIG_FILES([Makefile
+m4trace:configure.in:924: -1- AC_SUBST([WCM_PROGS])
+m4trace:configure.in:925: -1- AC_SUBST([WCM_LIBS])
+m4trace:configure.in:926: -1- AC_SUBST([WCM_TCLLIBS])
+m4trace:configure.in:927: -1- AC_SUBST([WCM_TCLPKGS])
+m4trace:configure.in:928: -1- AC_SUBST([WCM_MODULES])
+m4trace:configure.in:929: -1- AC_SUBST([WCM_XF86MODULES])
+m4trace:configure.in:930: -1- AC_SUBST([WCM_ARCH])
+m4trace:configure.in:931: -1- AC_SUBST([WCM_KSTACK])
+m4trace:configure.in:932: -1- AC_SUBST([WCM_MODVER])
+m4trace:configure.in:933: -1- AC_SUBST([WCM_KERNEL_DIR])
+m4trace:configure.in:934: -1- AC_SUBST([WCM_KERNEL_VER])
+m4trace:configure.in:935: -1- AC_SUBST([WCM_XFREE86_DIR])
+m4trace:configure.in:936: -1- AC_SUBST([WCM_XORGSDK_DIR])
+m4trace:configure.in:937: -1- AC_SUBST([WCM_MODDIR])
+m4trace:configure.in:938: -1- AC_SUBST([WCM_XSERVER64])
+m4trace:configure.in:939: -1- AC_SUBST([WCM_NO_MERGE_CONSTANTS])
+m4trace:configure.in:940: -1- AC_SUBST([WCM_NO_STACK_PROTECTOR])
+m4trace:configure.in:941: -1- AC_SUBST([WCM_CLEVEL])
+m4trace:configure.in:942: -1- AC_SUBST([WCM_XIDUMP_LIBS])
+m4trace:configure.in:943: -1- AC_SUBST([WCM_LIBWACOMCFG_LIBS])
+m4trace:configure.in:944: -1- AC_SUBST([WCM_WACOMXI_LIBS])
+m4trace:configure.in:945: -1- AC_SUBST([WCM_PREFIX])
+m4trace:configure.in:946: -1- AC_SUBST([WCM_XSETWACOM_LIBS])
+m4trace:configure.in:947: -1- AC_SUBST([WCM_DEPFLAGS])
+m4trace:configure.in:948: -1- AC_SUBST([WCM_OPTION_WACOM])
+m4trace:configure.in:949: -1- AC_SUBST([WCM_OPTION_HID])
+m4trace:configure.in:950: -1- AC_SUBST([WCM_OPTION_EVDEV])
+m4trace:configure.in:951: -1- AC_SUBST([WCM_OPTION_MOUSEDEV])
+m4trace:configure.in:952: -1- AC_SUBST([WCM_OPTION_USBMOUSE])
+m4trace:configure.in:953: -1- AC_SUBST([WCM_OPTION_INPUT])
+m4trace:configure.in:975: -1- AC_CONFIG_FILES([Makefile
mkxincludes
src/Makefile
src/util/Makefile
@@ -635,7 +653,7 @@
src/2.6.24/Makefile
src/wacomxi/Makefile
src/wacomxi/wacomcpl])
-m4trace:configure.in:941: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.in:975: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
You should run autoupdate.], [])
-m4trace:configure.in:941: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.in:941: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.in:975: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.in:975: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/ChangeLog new/linuxwacom-0.8.0/ChangeLog
--- old/linuxwacom-0.7.9-11/ChangeLog 2008-04-12 00:11:30.000000000 +0200
+++ new/linuxwacom-0.8.0/ChangeLog 2008-04-25 22:09:33.000000000 +0200
@@ -1,3 +1,9 @@
+2008-04-25 Ping Cheng
+ * Updated wacom.4x
+ * Update ~/.xsession from wacomcpl for KDE system
+ * Added IsXExtensionKeyboard check for Xserver 1.4 or later in wacomcfg.c
+ * Label 0.8.0
+
2008-04-11 Ping Cheng
* Excluded dixScreenOrigins call for Xorg 6.8.x
* Synchronized databases
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/configure.in new/linuxwacom-0.8.0/configure.in
--- old/linuxwacom-0.7.9-11/configure.in 2008-04-12 00:11:30.000000000 +0200
+++ new/linuxwacom-0.8.0/configure.in 2008-04-25 22:09:33.000000000 +0200
@@ -381,21 +381,23 @@
AC_MSG_CHECKING([if XFree86 support sending keys])
save_CFLAGS="$CFLAGS"
CFLAGS="-I$WCM_XFREE86_DIR $CFLAGS"
- AC_TRY_COMPILE(, [
+ AC_TRY_COMPILE([
#include
#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4, 3, 0, 0, 0)
# error "XFree86 < 4.3 doesn't support sending keys"
#endif
-int main(int argc, char** argv) {return 0;}
-], [WCM_SEND_KEYS=yes], [WCM_SEND_KEYS=no])
+], , [WCM_SEND_KEYS=yes], [WCM_SEND_KEYS=no])
CFLAGS="$save_CFLAGS"
AC_MSG_RESULT($WCM_SEND_KEYS)
-
if test "$WCM_SEND_KEYS" = "yes"; then
WCM_XDRIVER_QUIRKS="$WCM_XDRIVER_QUIRKS key-events"
AC_DEFINE(WCM_KEY_SENDING_SUPPORT, 1,
[The X-driver can send key events for a button])
fi
+
+ dnl Only Xorg has progressed >= 1.0
+ AC_DEFINE(WCM_XINPUTABI_MAJOR, 0,
+ [Slightly diffent abi in XINPUT >= 1.0])
fi
fi
if test "$WCM_ENV_XFREE86" = yes; then
@@ -403,7 +405,7 @@
AC_DEFINE(WCM_XFREE86,1,[Compiling for XFree86])
AC_MSG_CHECKING([if XFREE86 defines dixScreenOrigins])
save_CFLAGS="$CFLAGS"
- CFLAGS="-I$WCM_XFREE86_DIR $CFLAGS"
+ CFLAGS="-I$WCM_XFREE86_DIR/programs/Xserver/include -I$WCM_XFREE86_DIR/include $CFLAGS"
AC_TRY_COMPILE([#include ], [return dixScreenOrigins[0].x;],
[WCM_HAVE_DIXSCREENORIGINS=yes], [WCM_HAVE_DIXSCREENORIGINS=no])
CFLAGS="$save_CFLAGS"
@@ -542,6 +544,38 @@
[Later X.org version uses dixScreenOrigins for screen positions and sizes])
fi
+ AC_MSG_CHECKING([XInput extension version])
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="-I$WCM_XORGSDK_DIR $CFLAGS"
+ AC_TRY_COMPILE([
+#include
+#if ABI_XINPUT_VERSION < SET_ABI_VERSION(1, 0)
+# error "XInput extension < 1.0"
+#endif
+], , [WCM_XINPUT_MAJOR=1], [WCM_XINPUT_MAJOR=0])
+ if test "$WCM_XINPUT_MAJOR" = "0"; then
+ AC_MSG_RESULT([< 1.0])
+ AC_DEFINE(WCM_XINPUTABI_MAJOR, 0,
+ [Slightly diffent abi in XINPUT >= 1.0])
+ else
+ AC_TRY_COMPILE([
+#include
+#if ABI_XINPUT_VERSION < SET_ABI_VERSION(2, 0)
+# error "XInput extension < 2.0"
+#endif
+], , [WCM_XINPUT_MAJOR=2], [WCM_XINPUT_MAJOR=1])
+ if test "$WCM_XINPUT_MAJOR" = "1"; then
+ AC_MSG_RESULT([>= 1.0 && < 2.0])
+ AC_DEFINE(WCM_XINPUTABI_MAJOR, 1,
+ [Slightly diffent abi in XINPUT >= 1.0])
+ else
+ AC_MSG_RESULT([>= 2.0])
+ AC_DEFINE(WCM_XINPUTABI_MAJOR, 2,
+ [Slightly diffent abi in XINPUT >= 1.0])
+ fi
+ fi
+ CFLAGS="$save_CFLAGS"
+
dnl Try to get rid of a few warnings, X.org 1.4 need c99
case "$WCM_XORGSDK_VER" in
1.0*|1.1*|1.2*|1.3*)
Files old/linuxwacom-0.7.9-11/prebuilt/32/.libs/libwacomcfg.a and new/linuxwacom-0.8.0/prebuilt/32/.libs/libwacomcfg.a differ
Files old/linuxwacom-0.7.9-11/prebuilt/32/.libs/libwacomcfg.so.0.0.1 and new/linuxwacom-0.8.0/prebuilt/32/.libs/libwacomcfg.so.0.0.1 differ
Files old/linuxwacom-0.7.9-11/prebuilt/32/.libs/libwacomxi.a and new/linuxwacom-0.8.0/prebuilt/32/.libs/libwacomxi.a differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/prebuilt/32/wacomcpl-exec new/linuxwacom-0.8.0/prebuilt/32/wacomcpl-exec
--- old/linuxwacom-0.7.9-11/prebuilt/32/wacomcpl-exec 2008-04-12 00:12:43.000000000 +0200
+++ new/linuxwacom-0.8.0/prebuilt/32/wacomcpl-exec 2008-04-25 22:10:22.000000000 +0200
@@ -99,9 +99,18 @@
proc updateXinitrc {device option value} {
if { ![ file exists ~/.xinitrc ] } {
- exec echo "xsetwacom set $device $option \"$value\"" > ~/.xinitrc
- exec echo "# run the primary system script" >> ~/.xinitrc
- exec echo ". /etc/X11/xinit/xinitrc" >> ~/.xinitrc
+ if { [ file exists ~/.xsession ] } {
+ file copy -force ~/.xsession ~/.xsession.bak
+ file copy -force ~/.xsession /tmp/xsession1
+ exec sed -e "/xsetwacom set $device $option /d" /tmp/xsession1 > /tmp/wacom
+ exec echo "xsetwacom set $device $option \"$value\"" > ~/.xsession
+ exec cat /tmp/wacom >> ~/.xsession
+ file delete -force /tmp/wacom /tmp/xsession1
+ } else {
+ exec echo "xsetwacom set $device $option \"$value\"" > ~/.xinitrc
+ exec echo "# run the primary system script" >> ~/.xinitrc
+ exec echo ". /etc/X11/xinit/xinitrc" >> ~/.xinitrc
+ }
} else {
file copy -force ~/.xinitrc ~/.xinitrc.bak
file copy -force ~/.xinitrc /tmp/xinitrc1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/prebuilt/32/xsetwacom new/linuxwacom-0.8.0/prebuilt/32/xsetwacom
--- old/linuxwacom-0.7.9-11/prebuilt/32/xsetwacom 2008-04-12 00:12:43.000000000 +0200
+++ new/linuxwacom-0.8.0/prebuilt/32/xsetwacom 2008-04-25 22:10:22.000000000 +0200
@@ -18,7 +18,7 @@
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-relink_command="(cd /home/pingc/linux/linuxwacom-cvs/linuxwacom-dev/src/util; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=\":/usr/lib/jre/lib/i386/client:/usr/lib/jre/lib/i386:/usr/lib/jre/lib/i386/client:/usr/lib/jre/lib/i386\"; export LD_LIBRARY_PATH; PATH=\"/usr/lib/qt-3.3/bin:/usr/kerberos/bin:/usr/local/bin:/bin:/usr/bin:/usr/lib/jre/bin:/home/pingc/bin:/usr/lib/jre/bin\"; export PATH; gcc -Wall -pedantic -O2 -I/usr/include -o \$progdir/\$file xsetwacom.o wcmAction.o ./.libs/libwacomcfg.so -L/usr/lib -lX11 -lXi -Wl,--rpath -Wl,/home/pingc/linux/linuxwacom-cvs/linuxwacom-dev/src/util/.libs -Wl,--rpath -Wl,/usr/local/lib)"
+relink_command="(cd /home/pingc/linux/linuxwacom-cvs/linuxwacom-dev/src/util; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=\":/usr/lib/jre/lib/i386/client:/usr/lib/jre/lib/i386:/usr/lib/jre/lib/i386/client:/usr/lib/jre/lib/i386:/usr/lib\"; export LD_LIBRARY_PATH; PATH=\"/usr/lib/qt-3.3/bin:/usr/kerberos/bin:/usr/local/bin:/bin:/usr/bin:/usr/lib/jre/bin:/home/pingc/bin:/usr/lib/jre/bin\"; export PATH; gcc -Wall -pedantic -O2 -I/usr/include -o \$progdir/\$file xsetwacom.o wcmAction.o ./.libs/libwacomcfg.so -L/usr/lib -lX11 -lXi -Wl,--rpath -Wl,/home/pingc/linux/linuxwacom-cvs/linuxwacom-dev/src/util/.libs -Wl,--rpath -Wl,/usr/local/lib)"
# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
Files old/linuxwacom-0.7.9-11/prebuilt/64/.libs/libwacomcfg.a and new/linuxwacom-0.8.0/prebuilt/64/.libs/libwacomcfg.a differ
Files old/linuxwacom-0.7.9-11/prebuilt/64/.libs/libwacomcfg.so.0.0.1 and new/linuxwacom-0.8.0/prebuilt/64/.libs/libwacomcfg.so.0.0.1 differ
Files old/linuxwacom-0.7.9-11/prebuilt/64/.libs/libwacomxi.a and new/linuxwacom-0.8.0/prebuilt/64/.libs/libwacomxi.a differ
Files old/linuxwacom-0.7.9-11/prebuilt/64/.libs/xsetwacom and new/linuxwacom-0.8.0/prebuilt/64/.libs/xsetwacom differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/prebuilt/64/wacomcpl-exec new/linuxwacom-0.8.0/prebuilt/64/wacomcpl-exec
--- old/linuxwacom-0.7.9-11/prebuilt/64/wacomcpl-exec 2008-04-12 01:18:30.000000000 +0200
+++ new/linuxwacom-0.8.0/prebuilt/64/wacomcpl-exec 2008-04-25 22:42:38.000000000 +0200
@@ -99,9 +99,18 @@
proc updateXinitrc {device option value} {
if { ![ file exists ~/.xinitrc ] } {
- exec echo "xsetwacom set $device $option \"$value\"" > ~/.xinitrc
- exec echo "# run the primary system script" >> ~/.xinitrc
- exec echo ". /etc/X11/xinit/xinitrc" >> ~/.xinitrc
+ if { [ file exists ~/.xsession ] } {
+ file copy -force ~/.xsession ~/.xsession.bak
+ file copy -force ~/.xsession /tmp/xsession1
+ exec sed -e "/xsetwacom set $device $option /d" /tmp/xsession1 > /tmp/wacom
+ exec echo "xsetwacom set $device $option \"$value\"" > ~/.xsession
+ exec cat /tmp/wacom >> ~/.xsession
+ file delete -force /tmp/wacom /tmp/xsession1
+ } else {
+ exec echo "xsetwacom set $device $option \"$value\"" > ~/.xinitrc
+ exec echo "# run the primary system script" >> ~/.xinitrc
+ exec echo ". /etc/X11/xinit/xinitrc" >> ~/.xinitrc
+ }
} else {
file copy -force ~/.xinitrc ~/.xinitrc.bak
file copy -force ~/.xinitrc /tmp/xinitrc1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/prebuilt/64/xsetwacom new/linuxwacom-0.8.0/prebuilt/64/xsetwacom
--- old/linuxwacom-0.7.9-11/prebuilt/64/xsetwacom 2008-04-12 01:18:30.000000000 +0200
+++ new/linuxwacom-0.8.0/prebuilt/64/xsetwacom 2008-04-25 22:42:38.000000000 +0200
@@ -18,7 +18,7 @@
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-relink_command="(cd /home/pingc/linux/linuxwacom-cvs/linuxwacom-dev/src/util; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr/kerberos/bin:/usr/lib64/ccache:/usr/local/bin:/bin:/usr/bin:/home/pingc/bin\"; export PATH; gcc -Wall -pedantic -O2 -D__amd64__ -I/usr/include -o \$progdir/\$file xsetwacom.o wcmAction.o ./.libs/libwacomcfg.so -L/usr/lib64 -lX11 -lXi -Wl,--rpath -Wl,/home/pingc/linux/linuxwacom-cvs/linuxwacom-dev/src/util/.libs -Wl,--rpath -Wl,/usr/local/lib)"
+relink_command="(cd /home/pingc/linux/linuxwacom-cvs/linuxwacom-prod/src/util; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr/kerberos/bin:/usr/lib64/ccache:/usr/local/bin:/bin:/usr/bin:/home/pingc/bin\"; export PATH; gcc -Wall -pedantic -O2 -D__amd64__ -I/usr/include -o \$progdir/\$file xsetwacom.o wcmAction.o ./.libs/libwacomcfg.so -L/usr/lib64 -lX11 -lXi -Wl,--rpath -Wl,/home/pingc/linux/linuxwacom-cvs/linuxwacom-prod/src/util/.libs -Wl,--rpath -Wl,/usr/local/lib)"
# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
Files old/linuxwacom-0.7.9-11/prebuilt/wacom.4x.gz and new/linuxwacom-0.8.0/prebuilt/wacom.4x.gz differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/src/include/xdrv-config.h.in new/linuxwacom-0.8.0/src/include/xdrv-config.h.in
--- old/linuxwacom-0.7.9-11/src/include/xdrv-config.h.in 2008-04-12 00:11:30.000000000 +0200
+++ new/linuxwacom-0.8.0/src/include/xdrv-config.h.in 2008-04-25 22:09:33.000000000 +0200
@@ -30,4 +30,7 @@
/* Later X.org version uses dixScreenOrigins for screen positions and sizes */
#undef WCM_HAVE_DIXSCREENORIGINS
+/* Slightly diffent abi in XINPUT >= 1.0 */
+#undef WCM_XINPUTABI_MAJOR
+
#endif /* _XDRV_CONFIG_H_ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/src/util/wacomcfg.c new/linuxwacom-0.8.0/src/util/wacomcfg.c
--- old/linuxwacom-0.7.9-11/src/util/wacomcfg.c 2008-04-12 00:11:30.000000000 +0200
+++ new/linuxwacom-0.8.0/src/util/wacomcfg.c 2008-04-25 22:09:33.000000000 +0200
@@ -138,8 +138,10 @@
#ifndef WCM_ISXEXTENSIONPOINTER
if (info->use != IsXExtensionDevice) continue;
#else
- if (info->use != IsXExtensionDevice && info->use != IsXExtensionPointer) continue;
+ if (info->use != IsXExtensionDevice && info->use != IsXExtensionPointer
+ && info->use != IsXExtensionKeyboard) continue;
#endif
+
if (!info->num_classes) continue;
nSize += sizeof(WACOMDEVICEINFO);
nSize += strlen(info->name) + 1;
@@ -163,7 +165,8 @@
#ifndef WCM_ISXEXTENSIONPOINTER
if (info->use != IsXExtensionDevice) continue;
#else
- if (info->use != IsXExtensionDevice && info->use != IsXExtensionPointer) continue;
+ if (info->use != IsXExtensionDevice && info->use != IsXExtensionPointer
+ && info->use != IsXExtensionKeyboard) continue;
#endif
/* ignore uninitialized tools */
if (!info->num_classes) continue;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/src/wacom.4x new/linuxwacom-0.8.0/src/wacom.4x
--- old/linuxwacom-0.7.9-11/src/wacom.4x 2008-04-12 00:11:30.000000000 +0200
+++ new/linuxwacom-0.8.0/src/wacom.4x 2008-04-25 22:09:33.000000000 +0200
@@ -1,7 +1,7 @@
.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/wacom/wacom.man,v 1.1 2001/01/24 00:06:39 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH WACOM 4x "linuxwacom 0.7.9" "X Version 11"
+.TH WACOM 4x "linuxwacom 0.8.0" "X Version 11"
.SH NAME
wacom \- Wacom input driver
.SH SYNOPSIS
@@ -42,10 +42,10 @@
unnecessary in Gimp if you don't need to move system cursor outside
of Gimp drawing area. "pad" is for Intuos 3 or Cintiq 21UX tablet
ExpressKeys/menu strips, and Graphire 4 or Bamboo tablet buttons, wheel,
-and/or ring. It is required for Intuos3, Cintiq 21UX, Graphire 4, and
+and/or ring. It is required for Intuos3, CintiqV5, Graphire 4, and
Bamboo if you want to use keystroke features. "pad" is reported as a
second tool in the driver. "touch" is for the tablet with touch support.
-Right now only a few serial Tablet PC has this feature.
+Right now only a few Tablet PCs have this feature.
.TP 4
.B Option \fI"Device"\fP \fI"path"\fP
sets the path to the special file which represents serial line where
@@ -168,12 +168,19 @@
of the active zone the same as the screen while maximizing the area
described by TopX, TopY, BottomX, BottomY.
.TP 4
-.B Option \fI"DebugLevel"\fP \fInumber \fP
+.B Option \fI"DebugLevel"\fP \fI"number"\fP
sets the level of debugging info reported. There are 12 levels, specified by
the integers between 1 and 12. Once it is defined, all the debug messages
-with a level less than or equal to the number will be logged into
+with a level less than or equal to the "number" will be logged into
/etc/X11/Xorg.0.log.
.TP 4
+.B Option \fI"CommonDBG"\fP \fI"number"\fP
+sets the level of debugging info for all devices defined for the
+same tablet. There are 12 levels in use, specified by the
+integers between 1 and 12. Once it is defined, all the debug
+messages with a level less than or equal to the "number" will
+be logged into /etc/X11/Xorg.0.log.
+.TP 4
.B Option \fI"CursorProx"\fP \fI"number"\fP
sets the max distance from tablet to stop reporting movement for cursor in relative mode. Default for Intuos series is 10, for Graphire series (including Volitos) is 42.
.TP 4
@@ -193,4 +200,4 @@
Frederic Lepied
Ping Cheng
John E. Joganic
-
+Magnus Vigerlöf
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/src/wacomxi/wacomcpl-exec new/linuxwacom-0.8.0/src/wacomxi/wacomcpl-exec
--- old/linuxwacom-0.7.9-11/src/wacomxi/wacomcpl-exec 2008-04-12 00:11:30.000000000 +0200
+++ new/linuxwacom-0.8.0/src/wacomxi/wacomcpl-exec 2008-04-25 22:09:33.000000000 +0200
@@ -99,9 +99,18 @@
proc updateXinitrc {device option value} {
if { ![ file exists ~/.xinitrc ] } {
- exec echo "xsetwacom set $device $option \"$value\"" > ~/.xinitrc
- exec echo "# run the primary system script" >> ~/.xinitrc
- exec echo ". /etc/X11/xinit/xinitrc" >> ~/.xinitrc
+ if { [ file exists ~/.xsession ] } {
+ file copy -force ~/.xsession ~/.xsession.bak
+ file copy -force ~/.xsession /tmp/xsession1
+ exec sed -e "/xsetwacom set $device $option /d" /tmp/xsession1 > /tmp/wacom
+ exec echo "xsetwacom set $device $option \"$value\"" > ~/.xsession
+ exec cat /tmp/wacom >> ~/.xsession
+ file delete -force /tmp/wacom /tmp/xsession1
+ } else {
+ exec echo "xsetwacom set $device $option \"$value\"" > ~/.xinitrc
+ exec echo "# run the primary system script" >> ~/.xinitrc
+ exec echo ". /etc/X11/xinit/xinitrc" >> ~/.xinitrc
+ }
} else {
file copy -force ~/.xinitrc ~/.xinitrc.bak
file copy -force ~/.xinitrc /tmp/xinitrc1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/src/xdrv/wcmCommon.c new/linuxwacom-0.8.0/src/xdrv/wcmCommon.c
--- old/linuxwacom-0.7.9-11/src/xdrv/wcmCommon.c 2008-04-12 00:11:30.000000000 +0200
+++ new/linuxwacom-0.8.0/src/xdrv/wcmCommon.c 2008-04-25 22:09:33.000000000 +0200
@@ -76,7 +76,7 @@
if (!(priv->flags & ABSOLUTE_FLAG) || !priv->wcmMMonitor)
{
/* Get the current screen that the cursor is in */
-#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+#if WCM_XINPUTABI_MAJOR == 0
if (miPointerCurrentScreen())
priv->currentScreen = miPointerCurrentScreen()->myNum;
#else
@@ -91,7 +91,7 @@
else if (priv->currentScreen == -1)
{
/* Get the current screen that the cursor is in */
-#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+#if WCM_XINPUTABI_MAJOR == 0
if (miPointerCurrentScreen())
priv->currentScreen = miPointerCurrentScreen()->myNum;
#else
@@ -511,7 +511,7 @@
WacomDevicePtr priv = (WacomDevicePtr) local->private;
WacomCommonPtr common = priv->common;
int is_absolute = priv->flags & ABSOLUTE_FLAG;
-#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+#if WCM_XINPUTABI_MAJOR == 0
int is_core = local->flags & (XI86_ALWAYS_CORE | XI86_CORE_POINTER);
#endif
int button_idx, naxes = priv->naxes;
@@ -531,7 +531,7 @@
if (!button) /* ignore this button event */
return;
-#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+#if WCM_XINPUTABI_MAJOR == 0
/* Switch the device to core mode, if required */
if (!is_core && (button & AC_CORE))
xf86XInputSetSendCoreEvents (local, TRUE);
@@ -623,7 +623,7 @@
break;
}
-#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+#if WCM_XINPUTABI_MAJOR == 0
/* Switch the device out of the core mode, if required */
if (!is_core && (button & AC_CORE))
xf86XInputSetSendCoreEvents (local, FALSE);
@@ -641,7 +641,7 @@
int fakeButton = 0, i, value = 0, naxes = priv->naxes;
unsigned *keyP = 0;
int is_absolute = priv->flags & ABSOLUTE_FLAG;
-#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+#if WCM_XINPUTABI_MAJOR == 0
int is_core = local->flags & (XI86_ALWAYS_CORE | XI86_CORE_POINTER);
#endif
DBG(10, priv->debugLevel, ErrorF("sendWheelStripEvents for %s \n", local->name));
@@ -738,7 +738,7 @@
"send fakeButton %x with value = %d \n",
fakeButton, value));
-#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+#if WCM_XINPUTABI_MAJOR == 0
/* Switch the device to core mode, if required */
if (!is_core && (fakeButton & AC_CORE))
xf86XInputSetSendCoreEvents (local, TRUE);
@@ -765,7 +765,7 @@
ErrorF ("WARNING: [%s] unsupported event %x \n", local->name, fakeButton);
}
-#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+#if WCM_XINPUTABI_MAJOR == 0
/* Switch the device out of the core mode, if required
*/
if (!is_core && (fakeButton & AC_CORE))
@@ -1455,7 +1455,7 @@
/* Tool on the tablet when driver starts. This sometime causes
* access errors to the device */
-#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+#if WCM_XINPUTABI_MAJOR == 0
if (!miPointerCurrentScreen())
#else
if (pDev && !miPointerGetScreen(pDev->dev))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/src/xdrv/wcmConfig.c new/linuxwacom-0.8.0/src/xdrv/wcmConfig.c
--- old/linuxwacom-0.7.9-11/src/xdrv/wcmConfig.c 2008-04-12 00:11:30.000000000 +0200
+++ new/linuxwacom-0.8.0/src/xdrv/wcmConfig.c 2008-04-25 22:09:33.000000000 +0200
@@ -85,7 +85,7 @@
local->dev = NULL;
local->private = priv;
local->private_flags = 0;
-#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+#if WCM_XINPUTABI_MAJOR == 0
local->history_size = 0;
#endif
local->old_x = -1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/linuxwacom-0.7.9-11/src/xdrv/xf86Wacom.c new/linuxwacom-0.8.0/src/xdrv/xf86Wacom.c
--- old/linuxwacom-0.7.9-11/src/xdrv/xf86Wacom.c 2008-04-12 00:11:30.000000000 +0200
+++ new/linuxwacom-0.8.0/src/xdrv/xf86Wacom.c 2008-04-25 22:09:33.000000000 +0200
@@ -584,7 +584,7 @@
nbaxes = priv->naxes = 6;
if (InitValuatorClassDeviceStruct(local->dev, nbaxes,
-#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+#if WCM_XINPUTABI_MAJOR == 0
xf86GetMotionEvents,
local->history_size,
#else
@@ -657,7 +657,7 @@
#endif /* WCM_KEY_SENDING_SUPPORT */
}
-#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+#if WCM_XINPUTABI_MAJOR == 0
/* allocate motion history buffer if needed */
xf86MotionHistoryAllocate(local);
#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org