diff -Nru wacom-tools-0.7.9.3/.cvsignore wacom-tools-0.7.9.8/.cvsignore --- wacom-tools-0.7.9.3/.cvsignore 2008-03-29 02:02:53.000000000 -0400 +++ wacom-tools-0.7.9.8/.cvsignore 1969-12-31 19:00:00.000000000 -0500 @@ -1,2 +0,0 @@ -Session.vim -TODO diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/debian/changelog /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/debian/changelog --- wacom-tools-0.7.9.3/debian/changelog 2008-03-29 02:02:53.000000000 -0400 +++ wacom-tools-0.7.9.8/debian/changelog 2008-03-29 02:02:53.000000000 -0400 @@ -1,3 +1,9 @@ +wacom-tools (1:0.7.9.8-1ubuntu1) hardy; urgency=high + + * New upstream version (LP: #195953) + + -- Tom Jaeger Fri, 28 Mar 2008 19:52:06 -0400 + wacom-tools (1:0.7.9.3-2ubuntu2) hardy; urgency=low * Add an epoch to the Conflicts/Replaces (LP: #180214). diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/debian/rules /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/debian/rules --- wacom-tools-0.7.9.3/debian/rules 2008-03-29 02:02:53.000000000 -0400 +++ wacom-tools-0.7.9.8/debian/rules 2008-03-29 02:02:53.000000000 -0400 @@ -213,6 +213,7 @@ cd $(objdir_lw) && \ ../configure --prefix=/usr \ --with-xmoduledir=/usr/lib/xorg/modules/input \ + --disable-quirk-tablet-rescale \ --disable-wacom \ --disable-libwacomxi touch $@ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/debian/wacom.templates /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/debian/wacom.templates --- wacom-tools-0.7.9.3/debian/wacom.templates 2008-03-29 02:02:53.000000000 -0400 +++ wacom-tools-0.7.9.8/debian/wacom.templates 2008-03-29 02:02:53.000000000 -0400 @@ -1,15 +1,18 @@ Template: wacom-kernel-modules/moduleorder Type: note -Description: The wacom module must be loaded before the HID module. - If the wacom driver is not loaded before the normal Linux HID driver then the - HID will have already claimed the device as a generic mouse and the wacom - driver will be ignored. This package may also replace some modules out of - your running kernel. It is typically not safe for this installer to - automatically unload the HID module and insert the wacom driver beneath it, - nor to automatically remove any of the other affected modules. - If you wish to install the wacom module without rebooting the machine you will - need to shut down all processes that use the HID module and its dependents and - unload them manually before installing the wacom module. The simplest thing to - do is reboot the machine at some convenient opportunity after the package - install is complete and let the new modules configuration determine the proper - loading order. +Description: Load the wacom module before the HID module + If the wacom driver is not loaded before the normal Linux Human + Interface Driver then the HID will have already claimed the device + as a generic mouse and the wacom driver will be ignored. + . + This package may also replace some modules out of the running + kernel. An automated unloading of the HID module, with insertion of + the wacom module beneath it, would be unsafe and therefore is not + attempted. + . + If you wish to install the wacom module without rebooting the + machine, you will need to shut down all processes that use the HID + module and its dependents and unload them manually before installing + the wacom module. The simplest thing to do is reboot the machine at + some convenient opportunity after the package install is complete and + let the new modules configuration determine the proper loading order. diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/acinclude.m4 /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/acinclude.m4 --- wacom-tools-0.7.9.3/linuxwacom/acinclude.m4 2008-03-29 02:02:53.000000000 -0400 +++ wacom-tools-0.7.9.8/linuxwacom/acinclude.m4 1969-12-31 19:00:00.000000000 -0500 @@ -1,521 +0,0 @@ -dnl Macros for configuring the Linux Wacom package -dnl -AC_DEFUN([AC_WCM_SET_PATHS],[ -if test "x$prefix" = xNONE -then WCM_PREFIX=$ac_default_prefix -else WCM_PREFIX=$prefix -fi -if test "x$exec_prefix" = xNONE -then WCM_EXECDIR=$WCM_PREFIX -else WCM_EXECDIR=$exec_prefix -fi -]) -AC_DEFUN([AC_WCM_CHECK_ENVIRON],[ -dnl Variables for various checks -WCM_KSTACK=-mpreferred-stack-boundary=2 -WCM_KERNEL=unknown -WCM_KERNEL_VER= -WCM_ISLINUX=no -WCM_ENV_KERNEL=no -WCM_OPTION_MODVER=no -WCM_KERNEL_WACOM_DEFAULT=no -WCM_ENV_XF86=no -WCM_ENV_XORGSDK=no -WCM_LINUX_INPUT= -WCM_PATCH_WACDUMP= -WCM_PATCH_WACOMDRV= -WCM_ENV_TCL=no -WCM_ENV_TK=no -WCM_XIDUMP_DEFAULT=yes -WCM_ENV_XLIB=no - -dnl Check architecture -AC_MSG_CHECKING(for arch type) -AC_ARG_WITH(arch, -AC_HELP_STRING([--with-arch], [Use specified architecture]), -[ WCM_ARCH=$withval -], -[ - dnl Try the compiler for the build arch first. - dnl We may be cross compiling or building for - dnl a 32bit system with a 64 bit kernel etc. - WCM_ARCH=`$CC -dumpmachine 2> /dev/null` - test $? = 0 || WCM_ARCH=`uname -m` -]) -AC_MSG_RESULT($WCM_ARCH) - -dnl Check for X server bit -AC_ARG_ENABLE(xserver64, -AC_HELP_STRING([--enable-xserver64], [Use specified X server bit [[default=usually]]]), -[ WCM_OPTION_XSERVER64=$enableval -], -[ - WCM_OPTION_XSERVER64=no - test `echo $WCM_ARCH | grep -c "64"` == 0 || WCM_OPTION_XSERVER64=yes -]) - -WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib -WCM_XLIBDIR_DEFAULT2=/usr/lib -if test "$WCM_OPTION_XSERVER64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - test `echo $WCM_ARCH | grep -c "x86_64"` == 0 || WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib64 - if test -d /usr/lib64; then - WCM_XLIBDIR_DEFAULT2=/usr/lib64 - fi -fi -if test -f "$WCM_XLIBDIR_DEFAULT/Server/include/xf86Version.h" || -test -f "$WCM_XLIBDIR_DEFAULT/Server/xf86Version.h"; then - WCM_XORGSDK_DEFAULT=$WCM_XLIBDIR_DEFAULT/Server -else - WCM_XORGSDK_DEFAULT=/usr -fi - -WCM_TCLTKDIR_DEFAULT=/usr -XF86SUBDIR=programs/Xserver/hw/xfree86 -WCM_LINUXWACOMDIR=`pwd` -WCM_ENV_NCURSES=no -dnl Check kernel type -AC_MSG_CHECKING(for kernel type) -WCM_KERNEL=`uname -s` -AC_MSG_RESULT($WCM_KERNEL) -dnl -dnl Check for linux -AC_MSG_CHECKING(for linux-based kernel) -islinux=`echo $WCM_KERNEL | grep -i linux | wc -l` -if test $islinux != 0; then - WCM_ISLINUX=yes -fi -AC_MSG_RESULT($WCM_ISLINUX) -if test x$WCM_ISLINUX != xyes; then - echo "***" - echo "*** WARNING:" - echo "*** Linux kernel not detected; linux-specific features will not" - echo "*** be built including USB support in XFree86 and kernel drivers." - echo "***" -fi -dnl -dnl Check for linux kernel override -AC_ARG_WITH(linux, -AS_HELP_STRING([--with-linux], [Override linux kernel check]), -[ WCM_ISLINUX=$withval ]) -dnl -dnl Handle linux specific features -if test x$WCM_ISLINUX = xyes; then - WCM_KERNEL_WACOM_DEFAULT=yes - WCM_LINUX_INPUT="-DLINUX_INPUT" - AC_DEFINE(WCM_ENABLE_LINUXINPUT,1,[Enable the Linux Input subsystem]) -else - WCM_PATCH_WACDUMP="(no USB) $WCM_PATCH_WACDUMP" - WCM_PATCH_WACOMDRV="(no USB) $WCM_PATCH_WACOMDRV" -fi -]) -dnl -dnl -dnl -AC_DEFUN([AC_WCM_CHECK_KERNELSOURCE],[ -dnl Check for kernel build environment -AC_ARG_WITH(kernel, -AS_HELP_STRING([--with-kernel=dir], [Specify kernel source directory]), -[ - AC_MSG_CHECKING(if kernel source is enabled) - if test "x$with_kernel" = "xno"; then - AC_MSG_RESULT(no) - WCM_KERNELDIR= - WCM_ENV_KERNEL=no - else - AC_MSG_RESULT(yes) - WCM_KERNELDIR="$withval" - AC_MSG_CHECKING(for valid kernel source tree) - if test -f "$WCM_KERNELDIR/include/linux/input.h"; then - AC_MSG_RESULT(ok) - WCM_ENV_KERNEL=yes - else - AC_MSG_RESULT(missing input.h) - AC_MSG_RESULT("Unable to find $WCM_KERNELDIR/include/linux/input.h") - WCM_ENV_KERNEL=no - fi - fi -], -[ - dnl guess directory - AC_MSG_CHECKING(for kernel sources) - WCM_KERNELDIR="/lib/modules/`uname -r`/source /lib/modules/`uname -r`/build /usr/src/linux /usr/src/linux-`uname -r` /usr/src/linux-2.4 /usr/src/linux-2.6" - - for i in $WCM_KERNELDIR; do - if test -f "$i/include/linux/input.h"; then - WCM_ENV_KERNEL=yes - WCM_KERNELDIR=$i - break - fi - done - - if test "x$WCM_ENV_KERNEL" = "xyes"; then - WCM_ENV_KERNEL=yes - AC_MSG_RESULT($WCM_KERNELDIR) - else - AC_MSG_RESULT(not found) - WCM_KERNELDIR="" - WCM_ENV_KERNEL=no - echo "***" - echo "*** WARNING:" - echo "*** Unable to guess kernel source directory" - echo "*** Looked at /lib/modules/`uname -r`/source" - echo "*** Looked at /usr/src/linux" - echo "*** Looked at /usr/src/linux-`uname -r`" - echo "*** Looked at /usr/src/linux-2.4" - echo "*** Looked at /usr/src/linux-2.6" - echo "*** Kernel modules will not be built" - echo "***" - fi -])]) -dnl -AC_DEFUN([AC_WCM_CHECK_MODSUPP],[ -dnl Check for kernel module support -if test x$WCM_ENV_KERNEL = xyes; then - AC_MSG_CHECKING(for kernel module support) - modcfg="" - if test -f "$WCM_KERNELDIR/include/linux/autoconf.h"; then - modcfg="`grep CONFIG_MODULES $WCM_KERNELDIR/include/linux/autoconf.h | cut -d' ' -f 3-`" - fi - if test "x$modcfg" = "x1"; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - WCM_KERNELDIR="" - WCM_ENV_KERNEL=no - WCM_OPTION_MODVER=no - fi -fi -]) -dnl -AC_DEFUN([AC_WCM_CHECK_MODVER],[ -dnl Guess modversioning -if test x$WCM_ENV_KERNEL = xyes; then - AC_MSG_CHECKING(for kernel module versioning) - UTS_PATH="" - MODUTS="" - if test -f "$WCM_KERNELDIR/include/linux/version.h"; then - UTS_PATH="$WCM_KERNELDIR/include/linux/version.h" - MODUTS=`grep UTS_RELEASE $UTS_PATH` - fi - if test -f "$WCM_KERNELDIR/include/linux/utsrelease.h" && test "x$MODUTS" = x; then - UTS_PATH="$WCM_KERNELDIR/include/linux/utsrelease.h" - MODUTS=`grep UTS_RELEASE $UTS_PATH` - fi - if test "x$MODUTS" = x; then - echo "***" - echo "*** WARNING:" - echo "*** Can not identify your kernel source version" - echo "*** Use your current running kernel version instead" - echo "***" - MODUTS=`uname -r` - fi - if test "x$MODUTS" != x; then - WCM_OPTION_MODVER=yes - AC_MSG_RESULT(yes) - ISVER=`echo $MODUTS | grep -c "\"2.4"` - if test "$ISVER" -gt 0; then - MINOR=`echo $MODUTS | cut -f 1 -d- | cut -f3 -d. | cut -f1 -d\" | sed 's/\([[0-9]]*\).*/\1/'` - if test $MINOR -ge 22; then - WCM_KERNEL_VER="2.4.22" - else - WCM_KERNEL_VER="2.4" - fi - else - ISVER=`echo $MODUTS | grep -c "2.6"` - if test "$ISVER" -gt 0; then - MINOR=`echo $MODUTS | cut -f 1 -d- | cut -f3 -d. | cut -f1 -d\" | sed 's/\([[0-9]]*\).*/\1/'` - if test $MINOR -ge 22; then - WCM_KERNEL_VER="2.6.22" - elif test $MINOR -eq 21; then - WCM_KERNEL_VER="2.6.19" - elif test $MINOR -eq 20; then - WCM_KERNEL_VER="2.6.19" - elif test $MINOR -eq 19; then - WCM_KERNEL_VER="2.6.19" - elif test $MINOR -eq 18; then - WCM_KERNEL_VER="2.6.18" - elif test $MINOR -eq 17; then - WCM_KERNEL_VER="2.6.16" - elif test $MINOR -eq 16; then - WCM_KERNEL_VER="2.6.16" - elif test $MINOR -eq 15; then - WCM_KERNEL_VER="2.6.15" - elif test $MINOR -eq 14; then - WCM_KERNEL_VER="2.6.14" - elif test $MINOR -eq 13; then - WCM_KERNEL_VER="2.6.13" - elif test $MINOR -eq 12; then - WCM_KERNEL_VER="2.6.11" - elif test $MINOR -eq 11; then - WCM_KERNEL_VER="2.6.11" - elif test $MINOR -eq 10; then - WCM_KERNEL_VER="2.6.10" - elif test $MINOR -eq 9; then - WCM_KERNEL_VER="2.6.9" - elif test $MINOR -eq 8; then - WCM_KERNEL_VER="2.6.8" - else - echo "***" - echo "*** WARNING:" - echo "*** $MODUTS is not supported by this package any more." - echo "*** Please upgrade your kernel to a version newer than 2.6.7." - echo "*** Or use linuxwacom-0.7.4 if you are not setting up for a newly released tablet model." - echo "***" - WCM_OPTION_MODVER=no - AC_MSG_RESULT(no) - WCM_ENV_KERNEL=no - fi - else - echo "***" - echo "*** WARNING:" - echo "*** $MODUTS is not supported by this package" - echo "*** Kernel modules will not be built" - echo "***" - WCM_OPTION_MODVER=no - AC_MSG_RESULT(no) - WCM_ENV_KERNEL=no - fi - fi - else - echo "***" - echo "*** WARNING:" - echo "*** Can not identify your kernel source version" - echo "*** Kernel modules will not be built" - echo "***" - WCM_KERNELDIR="" - WCM_ENV_KERNEL=no - WCM_OPTION_MODVER=no - AC_MSG_RESULT(no) - - fi -fi -]) -dnl -AC_DEFUN([AC_WCM_CHECK_XORG_SDK],[ -dnl Check for X11 sdk environment -dnl handle default case -AC_ARG_WITH(xorg-sdk, -AS_HELP_STRING([--with-xorg-sdk=dir], [Specify Xorg SDK directory]), -[ WCM_XORGSDK="$withval"; ]) -if test x$WCM_ENV_XF86 != xyes; then - dnl handle default case - if test "$WCM_XORGSDK" = "yes" || test "$WCM_XORGSDK" == ""; then - WCM_XORGSDK=$WCM_XORGSDK_DEFAULT - fi - if test -n "$WCM_XORGSDK"; then - AC_MSG_CHECKING(for valid Xorg SDK) - if test -f $WCM_XORGSDK/include/xf86Version.h; then - WCM_XORGSDK=$WCM_XORGSDK/include - WCM_ENV_XORGSDK=yes - AC_MSG_RESULT(ok) - elif test -f $WCM_XORGSDK/include/xorg/xf86Version.h; then - WCM_ENV_XORGSDK=yes - WCM_XORGSDK=$WCM_XORGSDK/include/xorg - AC_MSG_RESULT(ok) - elif test -f $WCM_XORGSDK/xc/include/xf86Version.h; then - WCM_ENV_XORGSDK=yes - WCM_XORGSDK=$WCM_XORGSDK/xc/include - AC_MSG_RESULT(ok) - else - WCM_ENV_XORGSDK=no - AC_MSG_RESULT("xf86Version.h missing") - AC_MSG_RESULT([Tried $WCM_XORGSDK/include, $WCM_XORGSDK/include/xorg and $WCM_XORGSDK/xc/include]) - fi - fi -fi -AM_CONDITIONAL(WCM_ENV_XORGSDK, [test x$WCM_ENV_XORGSDK = xyes]) -]) -AC_DEFUN([AC_WCM_CHECK_XSOURCE],[ -dnl Check for X build environment -if test -d x-includes; then - WCM_XF86DIR=x-includes -fi -AC_ARG_WITH(x-src, -AS_HELP_STRING([--with-x-src=dir], [Specify X driver build directory]), -[ WCM_XF86DIR="$withval"; ]) -if test -n "$WCM_XF86DIR"; then - AC_MSG_CHECKING(for valid XFree86/X.org build environment) - if test -f $WCM_XF86DIR/xc/$XF86SUBDIR/xf86Version.h; then - WCM_ENV_XF86=yes - WCM_XF86DIR="$WCM_XF86DIR/xc" - AC_MSG_RESULT(ok) - elif test -f $WCM_XF86DIR/$XF86SUBDIR/xf86Version.h; then - WCM_ENV_XF86=yes - AC_MSG_RESULT(ok) - else - WCM_ENV_XF86=no - AC_MSG_RESULT(xf86Version.h missing) - AC_MSG_RESULT(Tried $WCM_XF86DIR/$XF86SUBDIR and $WCM_XF86DIR/xc/$XF86SUBDIR) - fi -fi -AM_CONDITIONAL(WCM_ENV_XF86, [test x$WCM_ENV_XF86 = xyes]) -]) -AC_DEFUN([AC_WCM_CHECK_XLIB],[ -dnl Check for XLib development environment -WCM_XLIBDIR= -AC_ARG_WITH(xlib, -AS_HELP_STRING([--with-xlib=dir], [uses a specified X11R6 directory]), -[WCM_XLIBDIR=$withval]) - -dnl handle default case -AC_MSG_CHECKING(for X lib directory) - -if test -d $WCM_XLIBDIR && test -f $WCM_XLIBDIR/libX11.so; then - WCM_ENV_XLIB=yes - AC_MSG_RESULT(found) -elif test -f $WCM_XLIBDIR_DEFAULT2/libX11.so; then - WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 - AC_MSG_RESULT(found) -elif test -d $WCM_XLIBDIR_DEFAULT/X11 || - test -d $WCM_XLIBDIR_DEFAULT; then - WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT - AC_MSG_RESULT(found) -else - AC_MSG_RESULT([not found, tried $WCM_XLIBDIR_DEFAULT/X11 and $WCM_XLIBDIR_DEFAULT2]) - WCM_ENV_XLIB=no -fi -]) -AC_DEFUN([AC_WCM_CHECK_TCL],[ -dnl Check for TCL development environment -WCM_TCLDIR= -AC_ARG_WITH(tcl, -AS_HELP_STRING([--with-tcl=dir], [uses a specified tcl directory ]), -[ WCM_TCLDIR=$withval ]) - -dnl get tcl version -AC_PATH_PROG([TCLSH],[tclsh],[no]) -if test "x$TCLSH" != "xno"; then - AC_MSG_CHECKING([for tcl version]) - version=$(echo ["puts [set tcl_version]"] | $TCLSH) - AC_MSG_RESULT([$version]) -fi - -dnl handle default case -if test "$WCM_TCLDIR" = "yes" || test "$WCM_TCLDIR" == ""; then - AC_MSG_CHECKING([for tcl header files]) - dir="$WCM_TCLTKDIR_DEFAULT/include"; - for i in "" tcl/ "tcl$version/"; do - if test "x$WCM_ENV_TCL" != "xyes"; then - if test -f "$dir/$i/tcl.h"; then - AC_MSG_RESULT([$dir/$i]) - WCM_ENV_TCL=yes - WCM_TCLDIR="$dir/$i" - CFLAGS="$CFLAGS -I$WCM_TCLDIR" - fi - fi - done - if test "x$WCM_ENV_TCL" != "xyes"; then - AC_MSG_RESULT([not found; tried $WCM_TCLTKDIR_DEFAULT/include, tcl, and "tcl$version"; ]) - echo "***"; echo "*** WARNING:" - echo "*** The tcl development environment does not appear to" - echo "*** be installed. The header file tcl.h does not appear" - echo "*** in the include path. Do you have the tcl rpm or" - echo "*** equivalent package properly installed? Some build" - echo "*** features will be unavailable." - echo "***" - fi - -dnl handle specified case -elif test "$WCM_TCLDIR" != "no"; then - AC_MSG_CHECKING([for tcl header files]) - if test -f "$WCM_TCLDIR/include/tcl.h"; then - AC_MSG_RESULT(found) - WCM_ENV_TCL=yes - if test "$WCM_TCLDIR" != "/usr"; then - CFLAGS="$CFLAGS -I$WCM_TCLDIR/include" - fi - elif test -f "$WCM_TCLDIR/tcl.h"; then - AC_MSG_RESULT(found) - WCM_ENV_TCL=yes - if test "$WCM_TCLDIR" != "/usr"; then - CFLAGS="$CFLAGS -I$WCM_TCLDIR" - fi - else - AC_MSG_RESULT([not found; tried $WCM_TCLDIR/include/tcl.h and $WCM_TCLDIR/tcl.h]) - echo "***"; echo "*** WARNING:" - echo "*** The tcl development environment does not appear to" - echo "*** be installed. The header file tcl.h does not appear" - echo "*** in the include path. Do you have the tcl rpm or" - echo "*** equivalent package properly installed? Some build" - echo "*** features will be unavailable." - echo "***" - fi -fi -]) -AC_DEFUN([AC_WCM_CHECK_TK],[ -dnl Check for TK development environment -WCM_TKDIR= -AC_ARG_WITH(tk, -AS_HELP_STRING([--with-tk=dir], [uses a specified tk directory ]), -[ WCM_TKDIR=$withval ]) - -dnl handle default case -if test "$WCM_TKDIR" = "yes" || test "$WCM_TKDIR" == ""; then - AC_MSG_CHECKING([for tk header files]) - if test -f "$WCM_TCLTKDIR_DEFAULT/include/tk.h"; then - AC_MSG_RESULT(found) - WCM_ENV_TK=yes - WCM_TKDIR="$WCM_TCLTKDIR_DEFAULT/include" - elif test -f "$WCM_TCLDIR/include/tk.h" || test -f "$WCM_TCLDIR/tk.h"; then - AC_MSG_RESULT(found) - WCM_ENV_TK=yes - WCM_TKDIR="$WCM_TCLDIR" - else - AC_MSG_RESULT([not found; tried $WCM_TCLTKDIR_DEFAULT/include and $WCM_TCLDIR/include]) - echo "***"; echo "*** WARNING:" - echo "*** The tk development environment does not appear to" - echo "*** be installed. The header file tk.h does not appear" - echo "*** in the include path. Do you have the tk rpm or" - echo "*** equivalent package properly installed? Some build" - echo "*** features will be unavailable." - echo "***" - fi -dnl handle specified case -elif test "$WCM_TKDIR" != "no"; then - AC_MSG_CHECKING([for tk header files]) - if test -f "$WCM_TKDIR/include/tk.h"; then - AC_MSG_RESULT(found) - WCM_ENV_TK=yes - if test "$WCM_TCLDIR" != "$WCM_TKDIR" && test "$WCM_TKDIR" != "/usr"; then - CFLAGS="$CFLAGS -I$WCM_TKDIR/include" - fi - elif test -f "$WCM_TKDIR/tk.h"; then - AC_MSG_RESULT(found) - WCM_ENV_TK=yes - if test "$WCM_TCLDIR" != "$WCM_TKDIR" && test "$WCM_TKDIR" != "/usr"; then - CFLAGS="$CFLAGS -I$WCM_TKDIR" - fi - else - AC_MSG_RESULT([not found; tried $WCM_TKDIR/include/tk.h and $WCM_TKDIR/tk.h]) - echo "***"; echo "*** WARNING:" - echo "*** The tk library does not appear to be installed." - echo "*** Do you have the tk rpm or equivalent package properly" - echo "*** installed? Some build features will be unavailable." - echo "***" - fi -fi -]) -AC_DEFUN([AC_WCM_CHECK_NCURSES],[ -dnl Check for ncurses development environment -AC_CHECK_HEADER(ncurses.h, [WCM_ENV_NCURSES=yes]) -if test x$WCM_ENV_NCURSES != xyes; then - AC_CHECK_HEADER(ncurses/ncurses.h, [WCM_ENV_NCURSES=yes]) -fi -if test x$WCM_ENV_NCURSES != xyes; then - echo "***"; echo "*** WARNING:" - echo "*** The ncurses development library does not appear to be installed." - echo "*** The header file ncurses.h does not appear in the include path." - echo "*** Do you have the ncurses-devel rpm or equivalent package" - echo "*** properly installed? Some build features will be unavailable." - echo "***" - AC_DEFINE(WCM_ENABLE_NCURSES,0,[ncurses header files available]) -else - AC_DEFINE(WCM_ENABLE_NCURSES,1,[ncurses header files available]) -fi -AM_CONDITIONAL(WCM_ENV_NCURSES, [test x$WCM_ENV_NCURSES = xyes]) -]) diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/aclocal.m4 /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/aclocal.m4 --- wacom-tools-0.7.9.3/linuxwacom/aclocal.m4 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/aclocal.m4 2008-03-29 02:02:53.000000000 -0400 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,9 +11,17 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL +# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -101,7 +109,6 @@ AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_EXEEXT])dnl dnl - AC_LIBTOOL_SYS_MAX_CMD_LEN AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE AC_LIBTOOL_OBJDIR @@ -203,6 +210,8 @@ ;; esac +_LT_REQUIRED_DARWIN_CHECKS + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], enable_win32_dll=yes, enable_win32_dll=no) @@ -282,9 +291,80 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* ])# _LT_LINKER_BOILERPLATE +# _LT_REQUIRED_DARWIN_CHECKS +# -------------------------- +# Check for some things on darwin +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + case $host_os in + rhapsody* | darwin1.[[0123]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac +]) # _LT_AC_SYS_LIBPATH_AIX # ---------------------- @@ -609,7 +689,11 @@ *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; esac ;; esac @@ -702,7 +786,7 @@ $2=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" ]) @@ -973,7 +1057,7 @@ AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], [AC_CHECK_FUNC([dlopen], [lt_cv_dlopen="dlopen"], [AC_CHECK_LIB([dl], [dlopen], @@ -981,7 +1065,7 @@ [AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ]) ]) ]) @@ -1298,7 +1382,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[[4-9]]*) version_type=linux need_lib_prefix=no need_version=no @@ -1831,6 +1915,13 @@ AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no +AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -2330,7 +2421,7 @@ # whether `pass_all' will *always* work, you probably want this one. case $host_os in -aix4* | aix5*) +aix[[4-9]]*) lt_cv_deplibs_check_method=pass_all ;; @@ -2766,7 +2857,7 @@ fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -2823,6 +2914,7 @@ _LT_AC_TAGVAR(predeps, $1)= _LT_AC_TAGVAR(postdeps, $1)= _LT_AC_TAGVAR(compiler_lib_search_path, $1)= +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= # Source file extension for C++ test sources. ac_ext=cpp @@ -2932,7 +3024,7 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -2945,7 +3037,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) @@ -3091,51 +3183,23 @@ fi ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + if test "$GXX" = yes ; then output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else case $cc_basename in xlc*) @@ -3386,7 +3450,7 @@ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' @@ -3821,7 +3885,8 @@ # compiler output when linking a shared library. # Parse the compiler output and extract the necessary # objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], +[AC_REQUIRE([LT_AC_PROG_SED])dnl dnl we can't use the lt_simple_compile_test_code here, dnl because it contains code intended for an executable, dnl not a library. It's possible we should let each @@ -3946,6 +4011,11 @@ $rm -f confest.$objext +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi + # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in @@ -4002,7 +4072,6 @@ ;; esac ]) - case " $_LT_AC_TAGVAR(postdeps, $1) " in *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac @@ -4087,7 +4156,7 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -4264,6 +4333,7 @@ _LT_AC_TAGVAR(predeps, $1) \ _LT_AC_TAGVAR(postdeps, $1) \ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ _LT_AC_TAGVAR(archive_cmds, $1) \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ _LT_AC_TAGVAR(postinstall_cmds, $1) \ @@ -4326,7 +4396,7 @@ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -4563,6 +4633,10 @@ # shared library. postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) @@ -4912,7 +4986,7 @@ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -4969,7 +5043,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -5006,7 +5081,7 @@ esac else case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor @@ -5102,7 +5177,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler. _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' @@ -5253,7 +5328,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) @@ -5323,7 +5399,8 @@ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; hpux9* | hpux10* | hpux11*) @@ -5460,7 +5537,7 @@ # if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in "" | " "*) ;; @@ -5484,7 +5561,7 @@ # wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), $lt_tmp_static_flag, [], [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) @@ -5500,7 +5577,7 @@ ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -5522,6 +5599,7 @@ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ],[ runpath_var= _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -5552,12 +5630,14 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. _LT_CC_BASENAME([$compiler]) @@ -5607,7 +5687,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -5827,7 +5907,7 @@ fi ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -5847,7 +5927,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -6007,11 +6087,10 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -6750,7 +6829,7 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6760,14 +6839,31 @@ # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.10' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.10.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -6824,14 +6920,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -6840,8 +6936,10 @@ [AC_PREREQ(2.52)dnl ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -6855,15 +6953,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -6891,6 +6988,7 @@ ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -6956,6 +7054,7 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -7008,7 +7107,8 @@ AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -7033,8 +7133,9 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -7093,14 +7194,14 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -7117,16 +7218,20 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl +[AC_PREREQ([2.60])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi fi # test whether we have cygpath @@ -7146,6 +7251,9 @@ AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl @@ -7181,6 +7289,10 @@ [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) ]) @@ -7194,16 +7306,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -7216,7 +7329,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -7323,14 +7436,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -7346,6 +7459,7 @@ # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then @@ -7356,7 +7470,7 @@ fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -7364,60 +7478,23 @@ # AM_PROG_MKDIR_P # --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) +# Check for `mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) # Helper functions for option handling. -*- Autoconf -*- @@ -7529,9 +7606,21 @@ if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. @@ -7628,4 +7717,3 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([acinclude.m4]) diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/AUTHORS /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/AUTHORS --- wacom-tools-0.7.9.3/linuxwacom/AUTHORS 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/AUTHORS 2008-02-29 18:58:44.000000000 -0500 @@ -4,7 +4,8 @@ John E. Joganic for establishing this project; -Magnus Vigerlöf for fixing bugs and supporting user requests. +Magnus Vigerlöf for fixing bugs, adding new +features, and supporting user requests. Jens Georg for being active and supportive in discussion and development groups. diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/bootstrap /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/bootstrap --- wacom-tools-0.7.9.3/linuxwacom/bootstrap 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/bootstrap 2008-02-29 18:58:44.000000000 -0500 @@ -2,8 +2,6 @@ aclocal if test $? != 0; then exit; fi -autoheader -if test $? != 0; then exit; fi libtoolize --force --copy if test $? != 0; then exit; fi automake --foreign --add-missing diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/ChangeLog /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/ChangeLog --- wacom-tools-0.7.9.3/linuxwacom/ChangeLog 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/ChangeLog 2008-02-29 18:58:44.000000000 -0500 @@ -1,3 +1,36 @@ +2008-02-28 Ping Cheng + * Added support for Cintiq 20WSX + * Fixed Bug 1875050 (Kovid Goyal) + * Incorporated patch 1901778 (Steven Seed) + +2008-02-23 Magnus Vigerlöf + * The rescaling patch is now in X.org master database + * Updated configure.in + * Added 2.6.24 support + * Updated kernel 2.4 make file + +2008-01-22 Ping Cheng + * Updarted xsetwacom for Cintiq 12WX, Bamboo1, and BambooFun + * Regrouped the routines for coming Xorg 7.3 hot-plug support (Magnus Vigerlöf) + * refer to http://git.debian.org/?p=collab-maint/linux-wacom.git;a=summary for detailed changes + * Label 0.7.9-7 + +2008-01-10 Ping Cheng + * Label 0.7.9-6 + +2008-01-02 Ping Cheng + * Updated build and configure scripts (Magnus Vigerlöf) + * Support Xorg 7.3 with multimonitors + * Unified screen, tablet, and cordinate initialization + +2007-12-19 Ping Cheng + * Support multimonitor setup on 4 directions + +2007-12-13 Ping Cheng + * Updated wacomcpl + * Incorporated Xorg 7.3 workaround from Magnus Vigerlöf + * Label 0.7.9-4 + 2007-11-28 Ping Cheng * Clean support of outbound tracking for Bamboo, etc * Updated kernel 2.4.x code diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/config.guess /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/config.guess --- wacom-tools-0.7.9.3/linuxwacom/config.guess 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/config.guess 2008-03-29 02:02:53.000000000 -0400 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-03-06' +timestamp='2007-07-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -330,7 +330,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -793,7 +793,7 @@ exit ;; *:Interix*:[3456]*) case ${UNAME_MACHINE} in - x86) + x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; EM64T | authenticamd) diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/config.h.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/config.h.in --- wacom-tools-0.7.9.3/linuxwacom/config.h.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/config.h.in 1969-12-31 19:00:00.000000000 -0500 @@ -1,70 +0,0 @@ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Enable the Linux Input subsystem */ -#undef WCM_ENABLE_LINUXINPUT - -/* ncurses header files available */ -#undef WCM_ENABLE_NCURSES - -/* Do not need the dr.wValue patch */ -#undef WCM_PATCH_DRVALUE - -/* Missing quirks */ -#undef WCM_PATCH_NOQUIRK - -/* Define to 1 if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/config.sub /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/config.sub --- wacom-tools-0.7.9.3/linuxwacom/config.sub 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/config.sub 2008-03-29 02:02:53.000000000 -0400 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-18' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -475,8 +475,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -683,6 +683,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/configure /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/configure --- wacom-tools-0.7.9.3/linuxwacom/configure 2008-03-29 02:02:53.000000000 -0400 +++ wacom-tools-0.7.9.8/linuxwacom/configure 2008-03-29 02:02:53.000000000 -0400 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61. +# Generated by GNU Autoconf 2.61 for linuxwacom 0.7.9. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -724,13 +724,12 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='linuxwacom' +PACKAGE_TARNAME='linuxwacom' +PACKAGE_VERSION='0.7.9' +PACKAGE_STRING='linuxwacom 0.7.9' +PACKAGE_BUGREPORT='' -ac_unique_file="src/2.4/wacom.c" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -807,6 +806,7 @@ INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA +am__isrc CYGPATH_W PACKAGE VERSION @@ -859,6 +859,8 @@ ECHO AR RANLIB +DSYMUTIL +NMEDIT CPP CXX CXXFLAGS @@ -871,9 +873,14 @@ FFLAGS ac_ct_F77 LIBTOOL +PKG_CONFIG WCM_LIBWACOMCFG_VER -WCM_ENV_XF86_TRUE -WCM_ENV_XF86_FALSE +Xlib_CFLAGS +Xlib_LIBS +WCM_ENV_XFREE86_TRUE +WCM_ENV_XFREE86_FALSE +XSERVER_CFLAGS +XSERVER_LIBS WCM_ENV_XORGSDK_TRUE WCM_ENV_XORGSDK_FALSE XMKMF @@ -881,17 +888,11 @@ X_PRE_LIBS X_LIBS X_EXTRA_LIBS -WCM_CFLAGS_STACK_PROTECTOR TCLSH WCM_ENV_NCURSES_TRUE WCM_ENV_NCURSES_FALSE -WCM_WACOMXI_BINDIR -WCM_WACOMXI_LIBDIR WACOMXI_INSTALL_TRUE WACOMXI_INSTALL_FALSE -PKG_CONFIG -XSERVER_CFLAGS -XSERVER_LIBS WCM_DLLOADER_TRUE WCM_DLLOADER_FALSE WCM_PROGS @@ -899,26 +900,23 @@ WCM_TCLLIBS WCM_TCLPKGS WCM_MODULES -WCM_XF86PROGS WCM_XF86MODULES -WCM_EXPPROGS -WCM_EXPMODULES WCM_ARCH WCM_KSTACK WCM_MODVER -WCM_KERNELDIR +WCM_KERNEL_DIR WCM_KERNEL_VER -WCM_LINUXWACOMDIR -WCM_XF86DIR -WCM_XORGSDK -WCM_XLIBDIR +WCM_XFREE86_DIR +WCM_XORGSDK_DIR WCM_MODDIR WCM_XSERVER64 WCM_NO_MERGE_CONSTANTS -WCM_LINUX_INPUT +WCM_NO_STACK_PROTECTOR +WCM_CLEVEL WCM_XIDUMP_LIBS WCM_LIBWACOMCFG_LIBS WCM_WACOMXI_LIBS +WCM_PREFIX WCM_XSETWACOM_LIBS WCM_DEPFLAGS WCM_OPTION_WACOM @@ -945,10 +943,12 @@ CXXCPP F77 FFLAGS -XMKMF PKG_CONFIG +Xlib_CFLAGS +Xlib_LIBS XSERVER_CFLAGS -XSERVER_LIBS' +XSERVER_LIBS +XMKMF' # Initialize some variables set by options. @@ -987,7 +987,7 @@ localstatedir='${prefix}/var' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' infodir='${datarootdir}/info' htmldir='${docdir}' dvidir='${docdir}' @@ -1451,7 +1451,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +\`configure' configures linuxwacom 0.7.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1499,7 +1499,7 @@ --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --docdir=DIR documentation root [DATAROOTDIR/doc/linuxwacom] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1524,7 +1524,9 @@ fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of linuxwacom 0.7.9:";; + esac cat <<\_ACEOF Optional Features: @@ -1539,23 +1541,25 @@ --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-xserver64 Use specified X server bit [default=usually] + --enable-xserver64 Use 64bit XServer [default=usually] --enable-wacom Enable building wacom.o [default=no] - --enable-wacdump Enable building wacdump [default=yes] - --enable-xidump Enable building xidump [default=yes] - --enable-libwacomcfg Enable building libwacomcfg [default=yes] - --enable-xsetwacom Enable building xsetwacom [default=yes] - --enable-libwacomxi Enable building libwacomxi [default=yes] --enable-hid Enable building hid.o [default=no] --enable-usbmouse Enable building usbmouse.o [default=no] --enable-evdev Enable building evdev.o [default=no] --enable-mousedev Enable building mousedev.o [default=no] --enable-input Enable building input.o [default=no] - --enable-tabletdev Enable building tabletdev.o [default=no] + --enable-modver Enable kernel module versioning [default=usually] + --enable-quirk-tablet-rescale + Enable tablet to screen rescale code + [default=when_needed] + --enable-libwacomcfg Enable building libwacomcfg [default=yes] + --enable-libwacomxi Enable building libwacomxi [default=yes] + --enable-wacdump Enable building wacdump [default=yes] + --enable-xidump Enable building xidump [default=yes] + --enable-xsetwacom Enable building xsetwacom [default=yes] --enable-dlloader Use dlloader [default=usually] --enable-wacomdrv Enable building wacom_drv.{o,so} [default=yes] - --enable-modver Enable kernel module versioning [default=usually] - --enable-mkxincludes Enable mkxincludes, XF86 dependency builder + --enable-mkxincludes Enable mkxincludes, XFree86 dependency builder [default=no] Optional Packages: @@ -1568,11 +1572,11 @@ --with-arch Use specified architecture --with-linux Override linux kernel check --with-kernel=dir Specify kernel source directory + --with-xlib=dir uses a specified X11R6 directory --with-x-src=dir Specify X driver build directory --with-xorg-sdk=dir Specify Xorg SDK directory --with-x use the X Window System - --with-xlib=dir uses a specified X11R6 directory - --with-tcl=dir uses a specified tcl directory + --with-tcl=dir uses the specified tcl directory --with-tk=dir uses a specified tk directory --with-xmoduledir Specify wacom_drv path explicitly. Implies --enable-dlloader @@ -1591,12 +1595,14 @@ CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags - XMKMF Path to xmkmf, Makefile generator for X Window System PKG_CONFIG path to pkg-config utility + Xlib_CFLAGS C compiler flags for Xlib, overriding pkg-config + Xlib_LIBS linker flags for Xlib, overriding pkg-config XSERVER_CFLAGS C compiler flags for XSERVER, overriding pkg-config XSERVER_LIBS linker flags for XSERVER, overriding pkg-config + XMKMF Path to xmkmf, Makefile generator for X Window System Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1661,7 +1667,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +linuxwacom configure 0.7.9 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1675,7 +1681,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by linuxwacom $as_me 0.7.9, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2013,6 +2019,14 @@ + + + + + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2020,9 +2034,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_headers="$ac_config_headers config.h" +am__api_version='1.10' -am__api_version="1.9" ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2205,38 +2218,53 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" else - mkdir_p='$(install_sh) -d' + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" fi fi +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +echo "${ECHO_T}$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac for ac_prog in gawk mawk nawk awk do @@ -2319,12 +2347,16 @@ fi rmdir .tst 2>/dev/null -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } + fi fi # test whether we have cygpath @@ -2338,8 +2370,8 @@ # Define the identity of the package. - PACKAGE=linuxwacom - VERSION=0.7.9 + PACKAGE='linuxwacom' + VERSION='0.7.9' cat >>confdefs.h <<_ACEOF @@ -2367,7 +2399,7 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right @@ -2471,7 +2503,7 @@ fi fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -2496,9 +2528,7 @@ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } - - -if test $USE_MAINTAINER_MODE = yes; then + if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' else @@ -2509,6 +2539,14 @@ MAINT=$MAINTAINER_MODE_TRUE + +ac_config_headers="$ac_config_headers src/include/xdrv-config.h" + +ac_config_headers="$ac_config_headers src/include/kernel-config.h" + +ac_config_headers="$ac_config_headers src/include/util-config.h" + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3480,9 +3518,7 @@ am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi - - -if test "x$enable_dependency_tracking" != xno; then + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' else @@ -3492,7 +3528,6 @@ - depcc="$CC" am_compiler_list= { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 @@ -3560,6 +3595,7 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -3589,9 +3625,7 @@ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -4236,7 +4270,7 @@ # whether `pass_all' will *always* work, you probably want this one. case $host_os in -aix4* | aix5*) +aix[4-9]*) lt_cv_deplibs_check_method=pass_all ;; @@ -4452,7 +4486,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4455 "configure"' > conftest.$ac_ext + echo '#line 4489 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4624,7 +4658,11 @@ *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; esac ;; esac @@ -5683,6 +5721,7 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -5712,9 +5751,7 @@ echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then am__fastdepCXX_TRUE= @@ -6222,7 +6259,6 @@ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! - # find the maximum length of command line arguments { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } @@ -6537,7 +6573,7 @@ echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -7097,72 +7133,384 @@ ;; esac -enable_dlopen=no -enable_win32_dll=no -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 +echo "${ECHO_T}$DSYMUTIL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then - withval=$with_pic; pic_mode="$withval" +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 +echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } else - pic_mode=default + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -test -z "$pic_mode" && pic_mode=default - -# Use C for the default configuration in the libtool script -tagname= -lt_save_CC="$CC" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi -# Source file extension for C test sources. -ac_ext=c + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -# Object file extension for compiled C test sources. -objext=o -objext=$objext +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { echo "$as_me:$LINENO: result: $NMEDIT" >&5 +echo "${ECHO_T}$NMEDIT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 +echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# Allow CC to be a program name with arguments. -compiler=$CC + { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } +if test "${lt_cv_apple_cc_single_mod+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi +fi +{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } + { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 +echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int +main () +{ -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + lt_cv_ld_exported_symbols_list=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + lt_cv_ld_exported_symbols_list=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[0123]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac + + +enable_dlopen=no +enable_win32_dll=no + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then + enableval=$enable_libtool_lock; +fi + +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then + withval=$with_pic; pic_mode="$withval" +else + pic_mode=default +fi + +test -z "$pic_mode" && pic_mode=default + +# Use C for the default configuration in the libtool script +tagname= +lt_save_CC="$CC" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +objext=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* ac_outfile=conftest.$ac_objext echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* @@ -7190,11 +7538,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7193: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7541: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7197: \$? = $ac_status" >&5 + echo "$as_me:7545: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7464,10 +7812,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works=no + lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" @@ -7480,27 +7828,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7483: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7831: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7487: \$? = $ac_status" >&5 + echo "$as_me:7835: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works=yes + lt_cv_prog_compiler_pic_works=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_prog_compiler_pic_works" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -7527,10 +7875,10 @@ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works+set}" = set; then +if test "${lt_cv_prog_compiler_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works=no + lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -7543,20 +7891,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works=yes + lt_cv_prog_compiler_static_works=yes fi else - lt_prog_compiler_static_works=yes + lt_cv_prog_compiler_static_works=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_prog_compiler_static_works" = xyes; then +if test x"$lt_cv_prog_compiler_static_works" = xyes; then : else lt_prog_compiler_static= @@ -7584,11 +7932,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7587: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7935: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7591: \$? = $ac_status" >&5 + echo "$as_me:7939: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7668,12 +8016,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -7732,7 +8081,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -7952,7 +8301,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -7972,7 +8321,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -8244,11 +8593,10 @@ link_all_deplibs=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -8768,7 +9116,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -9302,6 +9650,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -9621,7 +9984,7 @@ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else { echo "$as_me:$LINENO: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } @@ -9897,7 +10260,7 @@ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -9946,7 +10309,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -11017,7 +11386,7 @@ # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -11030,7 +11399,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) @@ -11288,51 +11657,23 @@ fi ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac archive_cmds_need_lc_CXX=no hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported whole_archive_flag_spec_CXX='' link_all_deplibs_CXX=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + if test "$GXX" = yes ; then output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else case $cc_basename in xlc*) @@ -11583,7 +11924,7 @@ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' @@ -11990,7 +12331,6 @@ GCC_CXX="$GXX" LD_CXX="$LD" - cat > conftest.$ac_ext <&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_CXX=no + lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" @@ -12466,27 +12810,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12469: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12813: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12473: \$? = $ac_status" >&5 + echo "$as_me:12817: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_CXX=yes + lt_cv_prog_compiler_pic_works_CXX=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } -if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in "" | " "*) ;; *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; @@ -12513,10 +12857,10 @@ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_CXX=no + lt_cv_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -12529,20 +12873,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_CXX=yes + lt_cv_prog_compiler_static_works_CXX=yes fi else - lt_prog_compiler_static_works_CXX=yes + lt_cv_prog_compiler_static_works_CXX=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } -if test x"$lt_prog_compiler_static_works_CXX" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then : else lt_prog_compiler_static_CXX= @@ -12570,11 +12914,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12573: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12917: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12577: \$? = $ac_status" >&5 + echo "$as_me:12921: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12627,7 +12971,7 @@ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -12649,6 +12993,7 @@ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 echo "${ECHO_T}$ld_shlibs_CXX" >&6; } @@ -12750,7 +13095,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -13283,6 +13628,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -13366,6 +13726,7 @@ predeps_CXX \ postdeps_CXX \ compiler_lib_search_path_CXX \ + compiler_lib_search_dirs_CXX \ archive_cmds_CXX \ archive_expsym_cmds_CXX \ postinstall_cmds_CXX \ @@ -13614,6 +13975,10 @@ # shared library. postdeps=$lt_postdeps_CXX +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_CXX @@ -13828,7 +14193,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -13866,7 +14231,7 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4* | aix5*) +aix[4-9]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -14131,10 +14496,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_F77+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_F77=no + lt_cv_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_F77" @@ -14147,27 +14512,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14150: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14515: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14154: \$? = $ac_status" >&5 + echo "$as_me:14519: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_F77=yes + lt_cv_prog_compiler_pic_works_F77=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } -if test x"$lt_prog_compiler_pic_works_F77" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in "" | " "*) ;; *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; @@ -14194,10 +14559,10 @@ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_F77+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_F77=no + lt_cv_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -14210,20 +14575,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_F77=yes + lt_cv_prog_compiler_static_works_F77=yes fi else - lt_prog_compiler_static_works_F77=yes + lt_cv_prog_compiler_static_works_F77=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } -if test x"$lt_prog_compiler_static_works_F77" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then : else lt_prog_compiler_static_F77= @@ -14251,11 +14616,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14254: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14619: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14258: \$? = $ac_status" >&5 + echo "$as_me:14623: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14335,12 +14700,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -14399,7 +14765,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_F77=no @@ -14619,7 +14985,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -14639,7 +15005,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -14891,11 +15257,10 @@ link_all_deplibs_F77=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -15364,7 +15729,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -15897,6 +16262,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -15980,6 +16360,7 @@ predeps_F77 \ postdeps_F77 \ compiler_lib_search_path_F77 \ + compiler_lib_search_dirs_F77 \ archive_cmds_F77 \ archive_expsym_cmds_F77 \ postinstall_cmds_F77 \ @@ -16228,6 +16609,10 @@ # shared library. postdeps=$lt_postdeps_F77 +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_F77 @@ -16402,7 +16787,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -16451,11 +16836,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16454: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16839: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16458: \$? = $ac_status" >&5 + echo "$as_me:16843: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16515,7 +16900,7 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; darwin* | rhapsody*) @@ -16585,7 +16970,7 @@ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; hpux9* | hpux10* | hpux11*) @@ -16725,10 +17110,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_GCJ=no + lt_cv_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_GCJ" @@ -16741,27 +17126,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16744: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17129: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16748: \$? = $ac_status" >&5 + echo "$as_me:17133: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_GCJ=yes + lt_cv_prog_compiler_pic_works_GCJ=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } -if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in "" | " "*) ;; *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; @@ -16788,10 +17173,10 @@ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_GCJ=no + lt_cv_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -16804,20 +17189,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_GCJ=yes + lt_cv_prog_compiler_static_works_GCJ=yes fi else - lt_prog_compiler_static_works_GCJ=yes + lt_cv_prog_compiler_static_works_GCJ=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } -if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then : else lt_prog_compiler_static_GCJ= @@ -16845,11 +17230,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16848: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17233: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16852: \$? = $ac_status" >&5 + echo "$as_me:17237: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16929,12 +17314,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -16993,7 +17379,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_GCJ=no @@ -17213,7 +17599,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -17233,7 +17619,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -17505,11 +17891,10 @@ link_all_deplibs_GCJ=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -17978,7 +18363,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -18511,6 +18896,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -18594,6 +18994,7 @@ predeps_GCJ \ postdeps_GCJ \ compiler_lib_search_path_GCJ \ + compiler_lib_search_dirs_GCJ \ archive_cmds_GCJ \ archive_expsym_cmds_GCJ \ postinstall_cmds_GCJ \ @@ -18842,6 +19243,10 @@ # shared library. postdeps=$lt_postdeps_GCJ +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ @@ -19015,7 +19420,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -19075,6 +19480,7 @@ predeps_RC \ postdeps_RC \ compiler_lib_search_path_RC \ + compiler_lib_search_dirs_RC \ archive_cmds_RC \ archive_expsym_cmds_RC \ postinstall_cmds_RC \ @@ -19323,6 +19729,10 @@ # shared library. postdeps=$lt_postdeps_RC +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_RC @@ -19511,947 +19921,880 @@ -WCM_LIBWACOMCFG_VER="0:1:0" - - -WCM_PROGS="" -WCM_LIBS="" -WCM_TCLLIBS="" -WCM_TCLPKGS="" -WCM_MODULES="" -WCM_XF86PROGS="" -WCM_XF86MODULES="" -WCM_XSERVER64="" -WCM_EXPPROGS="" -WCM_EXPMODULES="" -WCM_PATCH_HID="" - - -if test "x$prefix" = xNONE -then WCM_PREFIX=$ac_default_prefix -else WCM_PREFIX=$prefix -fi -if test "x$exec_prefix" = xNONE -then WCM_EXECDIR=$WCM_PREFIX -else WCM_EXECDIR=$exec_prefix -fi - - - -WCM_KSTACK=-mpreferred-stack-boundary=2 -WCM_KERNEL=unknown -WCM_KERNEL_VER= -WCM_ISLINUX=no -WCM_ENV_KERNEL=no -WCM_OPTION_MODVER=no -WCM_KERNEL_WACOM_DEFAULT=no -WCM_ENV_XF86=no -WCM_ENV_XORGSDK=no -WCM_LINUX_INPUT= -WCM_PATCH_WACDUMP= -WCM_PATCH_WACOMDRV= -WCM_ENV_TCL=no -WCM_ENV_TK=no -WCM_XIDUMP_DEFAULT=yes -WCM_ENV_XLIB=no - -{ echo "$as_me:$LINENO: checking for arch type" >&5 -echo $ECHO_N "checking for arch type... $ECHO_C" >&6; } - -# Check whether --with-arch was given. -if test "${with_arch+set}" = set; then - withval=$with_arch; WCM_ARCH=$withval +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - WCM_ARCH=`$CC -dumpmachine 2> /dev/null` - test $? = 0 || WCM_ARCH=`uname -m` - + ;; +esac fi - -{ echo "$as_me:$LINENO: result: $WCM_ARCH" >&5 -echo "${ECHO_T}$WCM_ARCH" >&6; } - -# Check whether --enable-xserver64 was given. -if test "${enable_xserver64+set}" = set; then - enableval=$enable_xserver64; WCM_OPTION_XSERVER64=$enableval - +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - - WCM_OPTION_XSERVER64=no - test `echo $WCM_ARCH | grep -c "64"` == 0 || WCM_OPTION_XSERVER64=yes - + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib -WCM_XLIBDIR_DEFAULT2=/usr/lib -if test "$WCM_OPTION_XSERVER64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - test `echo $WCM_ARCH | grep -c "x86_64"` == 0 || WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib64 - if test -d /usr/lib64; then - WCM_XLIBDIR_DEFAULT2=/usr/lib64 - fi -fi -if test -f "$WCM_XLIBDIR_DEFAULT/Server/include/xf86Version.h" || -test -f "$WCM_XLIBDIR_DEFAULT/Server/xf86Version.h"; then - WCM_XORGSDK_DEFAULT=$WCM_XLIBDIR_DEFAULT/Server -else - WCM_XORGSDK_DEFAULT=/usr fi - -WCM_TCLTKDIR_DEFAULT=/usr -XF86SUBDIR=programs/Xserver/hw/xfree86 -WCM_LINUXWACOMDIR=`pwd` -WCM_ENV_NCURSES=no -{ echo "$as_me:$LINENO: checking for kernel type" >&5 -echo $ECHO_N "checking for kernel type... $ECHO_C" >&6; } +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + PKG_CONFIG="" + fi + +fi + +WCM_LIBWACOMCFG_VER="0:1:0" + + +WCM_PROGS= +WCM_LIBS= +WCM_MODULES= +WCM_XF86MODULES= + +WCM_TCLLIBS="" +WCM_TCLPKGS="" +WCM_XSERVER64="" + +WCM_MODVER= +WCM_ENV_XFREE86=no +WCM_ENV_XORGSDK=no + +WCM_PREFIX=$prefix +test "$WCM_PREFIX" = NONE && WCM_PREFIX=$ac_default_prefix + +{ echo "$as_me:$LINENO: checking for arch type" >&5 +echo $ECHO_N "checking for arch type... $ECHO_C" >&6; } + +# Check whether --with-arch was given. +if test "${with_arch+set}" = set; then + withval=$with_arch; WCM_ARCHITECTURE=$withval +else + + WCM_ARCHITECTURE=`$CC -dumpmachine 2>/dev/null` + test $? = 0 || WCM_ARCHITECTURE=`uname -m` + +fi + +{ echo "$as_me:$LINENO: result: $WCM_ARCHITECTURE" >&5 +echo "${ECHO_T}$WCM_ARCHITECTURE" >&6; } +WCM_ARCH="`echo $WCM_ARCHITECTURE | cut -d- -f 1`" + +{ echo "$as_me:$LINENO: checking for kernel type" >&5 +echo $ECHO_N "checking for kernel type... $ECHO_C" >&6; } WCM_KERNEL=`uname -s` { echo "$as_me:$LINENO: result: $WCM_KERNEL" >&5 echo "${ECHO_T}$WCM_KERNEL" >&6; } + { echo "$as_me:$LINENO: checking for linux-based kernel" >&5 echo $ECHO_N "checking for linux-based kernel... $ECHO_C" >&6; } -islinux=`echo $WCM_KERNEL | grep -i linux | wc -l` -if test $islinux != 0; then +WCM_ISLINUX=no +if echo $WCM_KERNEL | grep -i linux >/dev/null; then WCM_ISLINUX=yes fi { echo "$as_me:$LINENO: result: $WCM_ISLINUX" >&5 echo "${ECHO_T}$WCM_ISLINUX" >&6; } -if test x$WCM_ISLINUX != xyes; then - echo "***" - echo "*** WARNING:" - echo "*** Linux kernel not detected; linux-specific features will not" - echo "*** be built including USB support in XFree86 and kernel drivers." - echo "***" + +WCM_OPTION_XSERVER64=no +# Check whether --enable-xserver64 was given. +if test "${enable_xserver64+set}" = set; then + enableval=$enable_xserver64; WCM_OPTION_XSERVER64=$enableval +else + echo $WCM_ARCHITECTURE | grep "64" >/dev/null && WCM_OPTION_XSERVER64=yes fi + + # Check whether --with-linux was given. if test "${with_linux+set}" = set; then withval=$with_linux; WCM_ISLINUX=$withval fi -if test x$WCM_ISLINUX = xyes; then - WCM_KERNEL_WACOM_DEFAULT=yes - WCM_LINUX_INPUT="-DLINUX_INPUT" - -cat >>confdefs.h <<\_ACEOF -#define WCM_ENABLE_LINUXINPUT 1 -_ACEOF +WCM_OPTION_WACOM=no +WCM_OPTION_HID=no +WCM_OPTION_USBMOUSE=no +WCM_OPTION_EVDEV=no +WCM_OPTION_MOUSEDEV=no +WCM_OPTION_INPUT=no +WCM_OPTION_MODVER=no +WCM_PATCH_HID= +WCM_ENV_KERNEL=no +WCM_KERNEL_DIR= +WCM_KERNEL_VER= +WCM_KSTACK= +if test "$WCM_ISLINUX" != yes; then + WCM_PATCH_WACDUMP="(no USB)" + WCM_PATCH_WACOMDRV="(no USB)" else - WCM_PATCH_WACDUMP="(no USB) $WCM_PATCH_WACDUMP" - WCM_PATCH_WACOMDRV="(no USB) $WCM_PATCH_WACOMDRV" -fi +cat >>confdefs.h <<\_ACEOF +#define WCM_ENABLE_LINUXINPUT +_ACEOF -if test x$WCM_ISLINUX = xyes; then + WCM_PATCH_WACDUMP= + WCM_PATCH_WACOMDRV= # Check whether --with-kernel was given. if test "${with_kernel+set}" = set; then - withval=$with_kernel; - { echo "$as_me:$LINENO: checking if kernel source is enabled" >&5 -echo $ECHO_N "checking if kernel source is enabled... $ECHO_C" >&6; } - if test "x$with_kernel" = "xno"; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - WCM_KERNELDIR= - WCM_ENV_KERNEL=no - else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - WCM_KERNELDIR="$withval" - { echo "$as_me:$LINENO: checking for valid kernel source tree" >&5 -echo $ECHO_N "checking for valid kernel source tree... $ECHO_C" >&6; } - if test -f "$WCM_KERNELDIR/include/linux/input.h"; then - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } - WCM_ENV_KERNEL=yes - else - { echo "$as_me:$LINENO: result: missing input.h" >&5 -echo "${ECHO_T}missing input.h" >&6; } - { echo "$as_me:$LINENO: result: \"Unable to find $WCM_KERNELDIR/include/linux/input.h\"" >&5 -echo "${ECHO_T}\"Unable to find $WCM_KERNELDIR/include/linux/input.h\"" >&6; } - WCM_ENV_KERNEL=no - fi - fi - -else + withval=$with_kernel; WCM_KERNEL_DIR="$withval" +fi - { echo "$as_me:$LINENO: checking for kernel sources" >&5 -echo $ECHO_N "checking for kernel sources... $ECHO_C" >&6; } - WCM_KERNELDIR="/lib/modules/`uname -r`/source /lib/modules/`uname -r`/build /usr/src/linux /usr/src/linux-`uname -r` /usr/src/linux-2.4 /usr/src/linux-2.6" - for i in $WCM_KERNELDIR; do - if test -f "$i/include/linux/input.h"; then + { echo "$as_me:$LINENO: checking for kernel source/headers" >&5 +echo $ECHO_N "checking for kernel source/headers... $ECHO_C" >&6; } + if test "$WCM_KERNEL_DIR" = "yes" -o -z "$WCM_KERNEL_DIR"; then + WCM_KERNEL_DIR= + for i in /lib/modules/`uname -r`/source /lib/modules/`uname -r`/build \ + /usr/src/linux /usr/src/linux-`uname -r` /usr/src/linux-2.4 \ + /usr/src/linux-2.6; do + if test -f "$i/include/linux/input.h"; then + WCM_KERNEL_DIR=$i + WCM_ENV_KERNEL=yes + { echo "$as_me:$LINENO: result: $WCM_KERNEL_DIR" >&5 +echo "${ECHO_T}$WCM_KERNEL_DIR" >&6; } + break + fi + done + if test -z "$WCM_KERNEL_DIR"; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + echo "***" + echo "*** WARNING:" + echo "*** Unable to guess kernel source directory" + echo "*** Looked at /lib/modules/`uname -r`/source, /lib/modules/`uname -r`/build," + echo "*** /usr/src/linux, /usr/src/linux-`uname -r`, /usr/src/linux-2.4, and" + echo "*** /usr/src/linux-2.6" + echo "*** Kernel modules will not be built" + echo "***" + fi + elif test "$WCM_KERNEL_DIR" != "no"; then + if test -f "$WCM_KERNEL_DIR/include/linux/input.h"; then WCM_ENV_KERNEL=yes - WCM_KERNELDIR=$i - break + { echo "$as_me:$LINENO: result: yes, $WCM_KERNEL_DIR" >&5 +echo "${ECHO_T}yes, $WCM_KERNEL_DIR" >&6; } + else + { { echo "$as_me:$LINENO: error: Provided kernel path is invalid" >&5 +echo "$as_me: error: Provided kernel path is invalid" >&2;} + { (exit 1); exit 1; }; } fi - done - - if test "x$WCM_ENV_KERNEL" = "xyes"; then - WCM_ENV_KERNEL=yes - { echo "$as_me:$LINENO: result: $WCM_KERNELDIR" >&5 -echo "${ECHO_T}$WCM_KERNELDIR" >&6; } - else - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - WCM_KERNELDIR="" - WCM_ENV_KERNEL=no - echo "***" - echo "*** WARNING:" - echo "*** Unable to guess kernel source directory" - echo "*** Looked at /lib/modules/`uname -r`/source" - echo "*** Looked at /usr/src/linux" - echo "*** Looked at /usr/src/linux-`uname -r`" - echo "*** Looked at /usr/src/linux-2.4" - echo "*** Looked at /usr/src/linux-2.6" - echo "*** Kernel modules will not be built" - echo "***" - fi - -fi - - -if test x$WCM_ENV_KERNEL = xyes; then - { echo "$as_me:$LINENO: checking for kernel module support" >&5 -echo $ECHO_N "checking for kernel module support... $ECHO_C" >&6; } - modcfg="" - if test -f "$WCM_KERNELDIR/include/linux/autoconf.h"; then - modcfg="`grep CONFIG_MODULES $WCM_KERNELDIR/include/linux/autoconf.h | cut -d' ' -f 3-`" - fi - if test "x$modcfg" = "x1"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } else + WCM_KERNEL_DIR= { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - WCM_KERNELDIR="" - WCM_ENV_KERNEL=no - WCM_OPTION_MODVER=no fi -fi - -if test x$WCM_ENV_KERNEL = xyes; then - { echo "$as_me:$LINENO: checking for kernel module versioning" >&5 -echo $ECHO_N "checking for kernel module versioning... $ECHO_C" >&6; } - UTS_PATH="" - MODUTS="" - if test -f "$WCM_KERNELDIR/include/linux/version.h"; then - UTS_PATH="$WCM_KERNELDIR/include/linux/version.h" - MODUTS=`grep UTS_RELEASE $UTS_PATH` - fi - if test -f "$WCM_KERNELDIR/include/linux/utsrelease.h" && test "x$MODUTS" = x; then - UTS_PATH="$WCM_KERNELDIR/include/linux/utsrelease.h" - MODUTS=`grep UTS_RELEASE $UTS_PATH` - fi - if test "x$MODUTS" = x; then - echo "***" - echo "*** WARNING:" - echo "*** Can not identify your kernel source version" - echo "*** Use your current running kernel version instead" - echo "***" - MODUTS=`uname -r` - fi - if test "x$MODUTS" != x; then - WCM_OPTION_MODVER=yes - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - ISVER=`echo $MODUTS | grep -c "\"2.4"` - if test "$ISVER" -gt 0; then - MINOR=`echo $MODUTS | cut -f 1 -d- | cut -f3 -d. | cut -f1 -d\" | sed 's/\([0-9]*\).*/\1/'` - if test $MINOR -ge 22; then - WCM_KERNEL_VER="2.4.22" - else - WCM_KERNEL_VER="2.4" - fi + if test -n "$WCM_KERNEL_DIR"; then + { echo "$as_me:$LINENO: checking kernel version" >&5 +echo $ECHO_N "checking kernel version... $ECHO_C" >&6; } + MODUTS= + for a in "$WCM_KERNEL_DIR/include/linux/version.h" \ + "$WCM_KERNEL_DIR/include/linux/utsrelease.h"; do + MODUTS=`grep UTS_RELEASE $a | sed -e 's/^[^"]*"\([^"]*\).*$/\1/g'` + test -n "$MODUTS" && break + done + if test -z "$MODUTS"; then + { echo "$as_me:$LINENO: WARNING: unable to identify kernel version" >&5 +echo "$as_me: WARNING: unable to identify kernel version" >&2;} else - ISVER=`echo $MODUTS | grep -c "2.6"` - if test "$ISVER" -gt 0; then - MINOR=`echo $MODUTS | cut -f 1 -d- | cut -f3 -d. | cut -f1 -d\" | sed 's/\([0-9]*\).*/\1/'` - if test $MINOR -ge 22; then - WCM_KERNEL_VER="2.6.22" - elif test $MINOR -eq 21; then - WCM_KERNEL_VER="2.6.19" - elif test $MINOR -eq 20; then - WCM_KERNEL_VER="2.6.19" - elif test $MINOR -eq 19; then - WCM_KERNEL_VER="2.6.19" - elif test $MINOR -eq 18; then - WCM_KERNEL_VER="2.6.18" - elif test $MINOR -eq 17; then - WCM_KERNEL_VER="2.6.16" - elif test $MINOR -eq 16; then - WCM_KERNEL_VER="2.6.16" - elif test $MINOR -eq 15; then - WCM_KERNEL_VER="2.6.15" - elif test $MINOR -eq 14; then - WCM_KERNEL_VER="2.6.14" - elif test $MINOR -eq 13; then - WCM_KERNEL_VER="2.6.13" - elif test $MINOR -eq 12; then - WCM_KERNEL_VER="2.6.11" - elif test $MINOR -eq 11; then - WCM_KERNEL_VER="2.6.11" - elif test $MINOR -eq 10; then - WCM_KERNEL_VER="2.6.10" - elif test $MINOR -eq 9; then - WCM_KERNEL_VER="2.6.9" - elif test $MINOR -eq 8; then - WCM_KERNEL_VER="2.6.8" + { echo "$as_me:$LINENO: result: $MODUTS" >&5 +echo "${ECHO_T}$MODUTS" >&6; } + MINOR=`echo $MODUTS | sed 's/[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/'` + if echo $MODUTS | grep "^2.4" >/dev/null; then + WCM_KERNEL_VER="2.4" + test $MINOR -ge 20 && WCM_PATCH_HID="(value_patch)" + test $MINOR -ge 22 && WCM_KERNEL_VER="2.4.22" + if echo $WCM_ARCHITECTURE | grep "x86_64" >/dev/null; then + { echo "$as_me:$LINENO: WARNING: module compilation not supported on x86-64 for Linux 2.4-kernels " >&5 +echo "$as_me: WARNING: module compilation not supported on x86-64 for Linux 2.4-kernels " >&2;} + WCM_KERNEL_VER= + fi + elif echo $MODUTS | grep "^2.6" >/dev/null; then + if test $MINOR -ge 8; then + case $MINOR in + 8) WCM_KERNEL_VER="2.6.8";; + 9) WCM_KERNEL_VER="2.6.9";; + 10) WCM_KERNEL_VER="2.6.10";; + 11|12) WCM_KERNEL_VER="2.6.11";; + 13) WCM_KERNEL_VER="2.6.13";; + 14) WCM_KERNEL_VER="2.6.14";; + 15) WCM_KERNEL_VER="2.6.15";; + 16|17) WCM_KERNEL_VER="2.6.16";; + 18) WCM_KERNEL_VER="2.6.18";; + 19|20|21) WCM_KERNEL_VER="2.6.19";; + 22|23) WCM_KERNEL_VER="2.6.22";; + *) WCM_KERNEL_VER="2.6.24";; + esac else - echo "***" - echo "*** WARNING:" - echo "*** $MODUTS is not supported by this package any more." - echo "*** Please upgrade your kernel to a version newer than 2.6.7." - echo "*** Or use linuxwacom-0.7.4 if you are not setting up for a newly released tablet model." - echo "***" - WCM_OPTION_MODVER=no - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - WCM_ENV_KERNEL=no + { echo "$as_me:$LINENO: WARNING: support for kernels older than 2.6.8 has been dropped after 0.7.4" >&5 +echo "$as_me: WARNING: support for kernels older than 2.6.8 has been dropped after 0.7.4" >&2;} fi else - echo "***" - echo "*** WARNING:" - echo "*** $MODUTS is not supported by this package" - echo "*** Kernel modules will not be built" - echo "***" - WCM_OPTION_MODVER=no - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - WCM_ENV_KERNEL=no + { echo "$as_me:$LINENO: WARNING: kernel version $MODUTS not supported" >&5 +echo "$as_me: WARNING: kernel version $MODUTS not supported" >&2;} fi fi - else - echo "***" - echo "*** WARNING:" - echo "*** Can not identify your kernel source version" - echo "*** Kernel modules will not be built" - echo "***" - WCM_KERNELDIR="" - WCM_ENV_KERNEL=no - WCM_OPTION_MODVER=no - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + fi + if test -n "$WCM_KERNEL_DIR"; then + { echo "$as_me:$LINENO: checking for kernel module support" >&5 +echo $ECHO_N "checking for kernel module support... $ECHO_C" >&6; } + if grep CONFIG_MODULES $WCM_KERNEL_DIR/include/linux/autoconf.h >/dev/null 2>&1; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + WCM_KERNEL_VER= + fi fi + + if test -n "$WCM_KERNEL_VER"; then + # Check whether --enable-wacom was given. +if test "${enable_wacom+set}" = set; then + enableval=$enable_wacom; WCM_OPTION_WACOM=$enable_wacom fi + # Check whether --enable-hid was given. +if test "${enable_hid+set}" = set; then + enableval=$enable_hid; WCM_OPTION_HID=$enable_hid fi -if test -d x-includes; then - WCM_XF86DIR=x-includes + if test "$WCM_OPTION_WACOM" = yes; then + WCM_MODULES="$WCM_MODULES wacom.o" + fi + if echo $WCM_KERNEL_VER | grep "^2.4" >/dev/null; then + # Check whether --enable-usbmouse was given. +if test "${enable_usbmouse+set}" = set; then + enableval=$enable_usbmouse; WCM_OPTION_USBMOUSE=$enable_usbmouse fi -# Check whether --with-x-src was given. -if test "${with_x_src+set}" = set; then - withval=$with_x_src; WCM_XF86DIR="$withval"; + # Check whether --enable-evdev was given. +if test "${enable_evdev+set}" = set; then + enableval=$enable_evdev; WCM_OPTION_EVDEV=$enable_evdev fi -if test -n "$WCM_XF86DIR"; then - { echo "$as_me:$LINENO: checking for valid XFree86/X.org build environment" >&5 -echo $ECHO_N "checking for valid XFree86/X.org build environment... $ECHO_C" >&6; } - if test -f $WCM_XF86DIR/xc/$XF86SUBDIR/xf86Version.h; then - WCM_ENV_XF86=yes - WCM_XF86DIR="$WCM_XF86DIR/xc" - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } - elif test -f $WCM_XF86DIR/$XF86SUBDIR/xf86Version.h; then - WCM_ENV_XF86=yes - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } - else - WCM_ENV_XF86=no - { echo "$as_me:$LINENO: result: xf86Version.h missing" >&5 -echo "${ECHO_T}xf86Version.h missing" >&6; } - { echo "$as_me:$LINENO: result: Tried $WCM_XF86DIR/$XF86SUBDIR and $WCM_XF86DIR/xc/$XF86SUBDIR" >&5 -echo "${ECHO_T}Tried $WCM_XF86DIR/$XF86SUBDIR and $WCM_XF86DIR/xc/$XF86SUBDIR" >&6; } - fi + # Check whether --enable-mousedev was given. +if test "${enable_mousedev+set}" = set; then + enableval=$enable_mousedev; WCM_OPTION_MOUSEDEV=$enable_mousedev fi + # Check whether --enable-input was given. +if test "${enable_input+set}" = set; then + enableval=$enable_input; WCM_OPTION_INPUT=$enable_input +fi -if test x$WCM_ENV_XF86 = xyes; then - WCM_ENV_XF86_TRUE= - WCM_ENV_XF86_FALSE='#' + # Check whether --enable-modver was given. +if test "${enable_modver+set}" = set; then + enableval=$enable_modver; WCM_OPTION_MODVER=$enable_modver else - WCM_ENV_XF86_TRUE='#' - WCM_ENV_XF86_FALSE= + WCM_OPTION_MODVER=yes fi + WCM_KSTACK="-mpreferred-stack-boundary=2" + if test "$WCM_OPTION_EVDEV" = yes; then + WCM_MODULES="$WCM_MODULES evdev.o" + fi + if test "$WCM_OPTION_USBMOUSE" = yes; then + if test "$WCM_KERNEL_VER" = "2.4.22"; then + if test -f $WCM_KERNEL_DIR/drivers/usb/usbmouse.c; then + cp $WCM_KERNEL_DIR/drivers/usb/usbmouse.c src/$WCM_KERNEL_VER + WCM_MODULES="$WCM_MODULES usbmouse.o" + else + { echo "$as_me:$LINENO: WARNING: usbmouse.c not found in kernel source" >&5 +echo "$as_me: WARNING: usbmouse.c not found in kernel source" >&2;} + WCM_OPTION_USBMOUSE=no + fi + else + WCM_MODULES="$WCM_MODULES usbmouse.o" + fi + fi + if test "$WCM_OPTION_MOUSEDEV" = yes; then + WCM_MODULES="$WCM_MODULES mousedev.o" + fi + if test "$WCM_OPTION_INPUT" = yes; then + if test "$WCM_KERNEL_VER" = "2.4.22"; then + if test -f $WCM_KERNEL_DIR/drivers/input/input.c; then + cp $WCM_KERNEL_DIR/drivers/input/input.c src/$WCM_KERNEL_VER + WCM_MODULES="$WCM_MODULES input.o" + else + { echo "$as_me:$LINENO: WARNING: input.c not found in kernel source" >&5 +echo "$as_me: WARNING: input.c not found in kernel source" >&2;} + WCM_OPTION_INPUT=no + fi + else + WCM_MODULES="$WCM_MODULES input.o" + fi + fi + if test "$WCM_OPTION_HID" = yes; then + if test "$WCM_KERNEL_VER" = "2.4.22"; then + if test -f $WCM_KERNEL_DIR/drivers/usb/hid-input.c; then + cp $WCM_KERNEL_DIR/drivers/usb/hid-input.c src/$WCM_KERNEL_VER + cp $WCM_KERNEL_DIR/drivers/usb/hiddev.c src/$WCM_KERNEL_VER + WCM_MODULES="$WCM_MODULES hid.o" + else + { echo "$as_me:$LINENO: WARNING: hid-input.c/hiddev.c not found in kernel source" >&5 +echo "$as_me: WARNING: hid-input.c/hiddev.c not found in kernel source" >&2;} + WCM_OPTION_HID=no + fi + else + WCM_MODULES="$WCM_MODULES hid.o" + fi + if echo "$WCM_PATCH_HID" | grep value_patch >/dev/null; then -# Check whether --with-xorg-sdk was given. -if test "${with_xorg_sdk+set}" = set; then - withval=$with_xorg_sdk; WCM_XORGSDK="$withval"; -fi +cat >>confdefs.h <<\_ACEOF +#define WCM_PATCH_DRVALUE 1 +_ACEOF -if test x$WCM_ENV_XF86 != xyes; then - if test "$WCM_XORGSDK" = "yes" || test "$WCM_XORGSDK" == ""; then - WCM_XORGSDK=$WCM_XORGSDK_DEFAULT - fi - if test -n "$WCM_XORGSDK"; then - { echo "$as_me:$LINENO: checking for valid Xorg SDK" >&5 -echo $ECHO_N "checking for valid Xorg SDK... $ECHO_C" >&6; } - if test -f $WCM_XORGSDK/include/xf86Version.h; then - WCM_XORGSDK=$WCM_XORGSDK/include - WCM_ENV_XORGSDK=yes - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } - elif test -f $WCM_XORGSDK/include/xorg/xf86Version.h; then - WCM_ENV_XORGSDK=yes - WCM_XORGSDK=$WCM_XORGSDK/include/xorg - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } - elif test -f $WCM_XORGSDK/xc/include/xf86Version.h; then - WCM_ENV_XORGSDK=yes - WCM_XORGSDK=$WCM_XORGSDK/xc/include - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } - else - WCM_ENV_XORGSDK=no - { echo "$as_me:$LINENO: result: \"xf86Version.h missing\"" >&5 -echo "${ECHO_T}\"xf86Version.h missing\"" >&6; } - { echo "$as_me:$LINENO: result: Tried $WCM_XORGSDK/include, $WCM_XORGSDK/include/xorg and $WCM_XORGSDK/xc/include" >&5 -echo "${ECHO_T}Tried $WCM_XORGSDK/include, $WCM_XORGSDK/include/xorg and $WCM_XORGSDK/xc/include" >&6; } + else + +cat >>confdefs.h <<\_ACEOF +#define WCM_PATCH_DRVALUE 0 +_ACEOF + + fi + fi + if test $WCM_OPTION_MODVER = yes; then + WCM_MODVER="-DCONFIG_MODVERSIONS -DMODVERSIONS -include $WCM_KERNEL_DIR/include/linux/modversions.h" + fi + elif echo $WCM_KERNEL_VER | grep "^2.6" >/dev/null 2>&1; then + MINOR=`echo $WCM_KERNEL_VER | cut -f 3 -d.` + if test $MINOR -ge 18; then + WCM_OPTION_HID=no + else + WCM_MODULES="$WCM_MODULES hid.o" + fi fi fi fi +WCM_CLEVEL=-ansi +WCM_ENV_XLIB=no +WCM_XLIB_DIR= +WCM_XSERVER64= -if test x$WCM_ENV_XORGSDK = xyes; then - WCM_ENV_XORGSDK_TRUE= - WCM_ENV_XORGSDK_FALSE='#' -else - WCM_ENV_XORGSDK_TRUE='#' - WCM_ENV_XORGSDK_FALSE= +# Check whether --with-xlib was given. +if test "${with_xlib+set}" = set; then + withval=$with_xlib; WCM_XLIB_DIR=$withval fi +if test -z "$WCM_XLIB_DIR" -o "$WCM_XLIB_DIR" = "yes"; then -# Define X_CFLAGS, X_LIBS, X_EXTRA_LIBS and X_PRELIBS as required if X -# is found, else defines X_DISPLAY_MISSING. We need at least X_CFLAGS. -{ echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6; } - +pkg_failed=no +{ echo "$as_me:$LINENO: checking for Xlib" >&5 +echo $ECHO_N "checking for Xlib... $ECHO_C" >&6; } -# Check whether --with-x was given. -if test "${with_x+set}" = set; then - withval=$with_x; +if test -n "$PKG_CONFIG"; then + if test -n "$Xlib_CFLAGS"; then + pkg_cv_Xlib_CFLAGS="$Xlib_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "x11") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_Xlib_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null` +else + pkg_failed=yes fi - -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled + fi else - case $x_includes,$x_libraries in #( - *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 -echo "$as_me: error: Cannot use X directory names containing '" >&2;} - { (exit 1); exit 1; }; };; #( - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$Xlib_LIBS"; then + pkg_cv_Xlib_LIBS="$Xlib_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "x11") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_Xlib_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null` else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - cat >Imakefile <<'_ACEOF' -incroot: - @echo incroot='${INCROOT}' -usrlibdir: - @echo usrlibdir='${USRLIBDIR}' -libdir: - @echo libdir='${LIBDIR}' -_ACEOF - if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - for ac_var in incroot usrlibdir libdir; do - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" - done - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && - test -f "$ac_im_libdir/libX11.$ac_extension"; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ac_x_includes= ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -f -r conftest.dir + pkg_failed=yes +fi + fi +else + pkg_failed=untried fi -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include +if test $pkg_failed = yes; then -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + Xlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"` + else + Xlib_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` + fi + # Put the nasty error message in config.log where it belongs + echo "$Xlib_PKG_ERRORS" >&5 -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include + { echo "$as_me:$LINENO: checking for X lib directory" >&5 +echo $ECHO_N "checking for X lib directory... $ECHO_C" >&6; } + WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib + WCM_XLIBDIR_DEFAULT2=/usr/lib + if test "$WCM_OPTION_XSERVER64" = "yes"; then + WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib64 + test -d /usr/lib64 && WCM_XLIBDIR_DEFAULT2=/usr/lib64 + fi -/usr/openwin/include -/usr/openwin/share/include' + if test -f $WCM_XLIBDIR_DEFAULT/libX11.so; then + WCM_ENV_XLIB=yes + WCM_XLIB_DIR=$WCM_XLIBDIR_DEFAULT + { echo "$as_me:$LINENO: result: found, $WCM_XLIB_DIR" >&5 +echo "${ECHO_T}found, $WCM_XLIB_DIR" >&6; } + elif test -d $WCM_XLIBDIR_DEFAULT2; then + WCM_ENV_XLIB=yes + WCM_XLIB_DIR=$WCM_XLIBDIR_DEFAULT2 + { echo "$as_me:$LINENO: result: found, $WCM_XLIB_DIR" >&5 +echo "${ECHO_T}found, $WCM_XLIB_DIR" >&6; } + else + WCM_ENV_XLIB=no + { echo "$as_me:$LINENO: result: not found, tried $WCM_XLIBDIR_DEFAULT and $WCM_XLIBDIR_DEFAULT2" >&5 +echo "${ECHO_T}not found, tried $WCM_XLIBDIR_DEFAULT and $WCM_XLIBDIR_DEFAULT2" >&6; } + fi -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +elif test $pkg_failed = untried; then - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi + { echo "$as_me:$LINENO: checking for X lib directory" >&5 +echo $ECHO_N "checking for X lib directory... $ECHO_C" >&6; } + WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib + WCM_XLIBDIR_DEFAULT2=/usr/lib + if test "$WCM_OPTION_XSERVER64" = "yes"; then + WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib64 + test -d /usr/lib64 && WCM_XLIBDIR_DEFAULT2=/usr/lib64 + fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no + if test -f $WCM_XLIBDIR_DEFAULT/libX11.so; then + WCM_ENV_XLIB=yes + WCM_XLIB_DIR=$WCM_XLIBDIR_DEFAULT + { echo "$as_me:$LINENO: result: found, $WCM_XLIB_DIR" >&5 +echo "${ECHO_T}found, $WCM_XLIB_DIR" >&6; } + elif test -d $WCM_XLIBDIR_DEFAULT2; then + WCM_ENV_XLIB=yes + WCM_XLIB_DIR=$WCM_XLIBDIR_DEFAULT2 + { echo "$as_me:$LINENO: result: found, $WCM_XLIB_DIR" >&5 +echo "${ECHO_T}found, $WCM_XLIB_DIR" >&6; } + else + WCM_ENV_XLIB=no + { echo "$as_me:$LINENO: result: not found, tried $WCM_XLIBDIR_DEFAULT and $WCM_XLIBDIR_DEFAULT2" >&5 +echo "${ECHO_T}not found, tried $WCM_XLIBDIR_DEFAULT and $WCM_XLIBDIR_DEFAULT2" >&6; } + fi -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -XrmInitialize () - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r "$ac_dir/libX11.$ac_extension"; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi + Xlib_CFLAGS=$pkg_cv_Xlib_CFLAGS + Xlib_LIBS=$pkg_cv_Xlib_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no + WCM_XLIB_DIR="`$PKG_CONFIG --variable=libdir x11`" + WCM_ENV_XLIB=yes -case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) - # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" -esac fi -;; #( - *) have_x=yes;; - esac - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - { echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6; } - no_x=yes +elif test "$WCM_XLIB_DIR" != "no"; then + { echo "$as_me:$LINENO: checking for X lib directory" >&5 +echo $ECHO_N "checking for X lib directory... $ECHO_C" >&6; } + if test -f $WCM_XLIB_DIR/libX11.so; then + { echo "$as_me:$LINENO: result: found, $WCM_XLIB_DIR" >&5 +echo "${ECHO_T}found, $WCM_XLIB_DIR" >&6; } + WCM_ENV_XLIB=yes + else + { { echo "$as_me:$LINENO: error: Provided Xlib-path is invalid" >&5 +echo "$as_me: error: Provided Xlib-path is invalid" >&2;} + { (exit 1); exit 1; }; } + fi else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$x_includes'\ - ac_x_libraries='$x_libraries'" - { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } + WCM_ENV_XLIB=no +fi +if test "$WCM_ENV_XLIB" = yes; then + if test "$WCM_OPTION_XSERVER64" = "yes"; then + CFLAGS="$CFLAGS -D__amd64__" + WCM_XSERVER64="-D_XSERVER64" + fi fi -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi - - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - ac_xsave_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +WCM_XDRIVER_QUIRKS= +test -d "x-include" && WCM_XFREE86_DIR="x-include" -int -main () -{ +# Check whether --with-x-src was given. +if test "${with_x_src+set}" = set; then + withval=$with_x_src; WCM_XFREE86_DIR="$withval" +fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - X_LIBS="$X_LIBS -R$x_libraries" +if test -n "$WCM_XFREE86_DIR"; then + XFREE86SUBDIR=programs/Xserver/hw/xfree86 + { echo "$as_me:$LINENO: checking for valid XFree86/X.org build environment" >&5 +echo $ECHO_N "checking for valid XFree86/X.org build environment... $ECHO_C" >&6; } + if test -f $WCM_XFREE86_DIR/xc/$XFREE86SUBDIR/xf86Version.h; then + WCM_ENV_XFREE86=yes + WCM_XFREE86_DIR="$WCM_XFREE86_DIR/xc" + { echo "$as_me:$LINENO: result: ok, $WCM_XFREE86_DIR" >&5 +echo "${ECHO_T}ok, $WCM_XFREE86_DIR" >&6; } + elif test -f $WCM_XFREE86_DIR/$XFREE86SUBDIR/xf86Version.h; then + WCM_ENV_XFREE86=yes + { echo "$as_me:$LINENO: result: ok, $WCM_XFREE86_DIR" >&5 +echo "${ECHO_T}ok, $WCM_XFREE86_DIR" >&6; } + else + WCM_ENV_XFREE86=no + WCM_XFREE86_DIR= + { echo "$as_me:$LINENO: result: xf86Version.h missing" >&5 +echo "${ECHO_T}xf86Version.h missing" >&6; } + { echo "$as_me:$LINENO: result: Tried $WCM_XFREE86_DIR/$XFREE86SUBDIR and $WCM_XFREE86_DIR/xc/$XFREE86SUBDIR" >&5 +echo "${ECHO_T}Tried $WCM_XFREE86_DIR/$XFREE86SUBDIR and $WCM_XFREE86_DIR/xc/$XFREE86SUBDIR" >&6; } + fi + if test "$WCM_ENV_XFREE86" = "yes"; then + WCM_XDRIVER_QUIRKS="Libc-wrapper" + fi +fi +if test "$WCM_ENV_XFREE86" = yes; then + if true; then + WCM_ENV_XFREE86_TRUE= + WCM_ENV_XFREE86_FALSE='#' else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + WCM_ENV_XFREE86_TRUE='#' + WCM_ENV_XFREE86_FALSE= +fi -int -main () -{ - ; - return 0; -} +cat >>confdefs.h <<\_ACEOF +#define WCM_XFREE86 1 _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - X_LIBS="$X_LIBS -R $x_libraries" + else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if false; then + WCM_ENV_XFREE86_TRUE= + WCM_ENV_XFREE86_FALSE='#' +else + WCM_ENV_XFREE86_TRUE='#' + WCM_ENV_XFREE86_FALSE= +fi - { echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6; } fi +if test "$WCM_ENV_XFREE86" != yes; then -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +# Check whether --with-xorg-sdk was given. +if test "${with_xorg_sdk+set}" = set; then + withval=$with_xorg_sdk; WCM_XORGSDK_DIR="$withval" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_c_werror_flag=$ac_xsave_c_werror_flag - LIBS=$ac_xsave_LIBS - fi - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. + if test "$WCM_XORGSDK_DIR" = "yes" -o -z "$WCM_XORGSDK_DIR"; then - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +pkg_failed=no +{ echo "$as_me:$LINENO: checking for XSERVER" >&5 +echo $ECHO_N "checking for XSERVER... $ECHO_C" >&6; } -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XOpenDisplay (); -int -main () -{ -return XOpenDisplay (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 +if test -n "$PKG_CONFIG"; then + if test -n "$XSERVER_CFLAGS"; then + pkg_cv_XSERVER_CFLAGS="$XSERVER_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server\"") >&5 + ($PKG_CONFIG --exists --print-errors "xorg-server") 2>&5 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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - : + (exit $ac_status); }; then + pkg_cv_XSERVER_CFLAGS=`$PKG_CONFIG --cflags "xorg-server" 2>/dev/null` else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + pkg_failed=yes +fi + fi else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dnet_ntoa (); -int -main () -{ -return dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$XSERVER_LIBS"; then + pkg_cv_XSERVER_LIBS="$XSERVER_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server\"") >&5 + ($PKG_CONFIG --exists --print-errors "xorg-server") 2>&5 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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dnet_dnet_ntoa=yes + (exit $ac_status); }; then + pkg_cv_XSERVER_LIBS=`$PKG_CONFIG --libs "xorg-server" 2>/dev/null` else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi - ac_cv_lib_dnet_dnet_ntoa=no + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + XSERVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server"` + else + XSERVER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XSERVER_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + + { echo "$as_me:$LINENO: checking for valid Xorg SDK" >&5 +echo $ECHO_N "checking for valid Xorg SDK... $ECHO_C" >&6; } + WCM_XORGSDK_DEFAULT="$WCM_XLIB_DIR/Server" + test -d "$WCM_XORGSDK_DEFAULT" || WCM_XORGSDK_DEFAULT="/usr" + for a in include include/xorg xc/include; do + if test -f $WCM_XORGSDK_DEFAULT/$a/xf86Version.h; then + WCM_ENV_XORGSDK=yes + WCM_XORGSDK_DIR=$WCM_XORGSDK_DEFAULT/$a + { echo "$as_me:$LINENO: result: found, $WCM_XORGSDK_DIR" >&5 +echo "${ECHO_T}found, $WCM_XORGSDK_DIR" >&6; } + break + fi + done + if test -z "$WCM_XORGSDK_DIR"; then + { echo "$as_me:$LINENO: result: \"xf86Version.h missing\"" >&5 +echo "${ECHO_T}\"xf86Version.h missing\"" >&6; } + { echo "$as_me:$LINENO: result: Tried $WCM_XORGSDK_DEFAULT/include, $WCM_XORGSDK_DEFAULT/include/xorg, and $WCM_XORGSDK_DEFAULT/xc/include" >&5 +echo "${ECHO_T}Tried $WCM_XORGSDK_DEFAULT/include, $WCM_XORGSDK_DEFAULT/include/xorg, and $WCM_XORGSDK_DEFAULT/xc/include" >&6; } + fi + +elif test $pkg_failed = untried; then + + { echo "$as_me:$LINENO: checking for valid Xorg SDK" >&5 +echo $ECHO_N "checking for valid Xorg SDK... $ECHO_C" >&6; } + WCM_XORGSDK_DEFAULT="$WCM_XLIB_DIR/Server" + test -d "$WCM_XORGSDK_DEFAULT" || WCM_XORGSDK_DEFAULT="/usr" + for a in include include/xorg xc/include; do + if test -f $WCM_XORGSDK_DEFAULT/$a/xf86Version.h; then + WCM_ENV_XORGSDK=yes + WCM_XORGSDK_DIR=$WCM_XORGSDK_DEFAULT/$a + { echo "$as_me:$LINENO: result: found, $WCM_XORGSDK_DIR" >&5 +echo "${ECHO_T}found, $WCM_XORGSDK_DIR" >&6; } + break + fi + done + if test -z "$WCM_XORGSDK_DIR"; then + { echo "$as_me:$LINENO: result: \"xf86Version.h missing\"" >&5 +echo "${ECHO_T}\"xf86Version.h missing\"" >&6; } + { echo "$as_me:$LINENO: result: Tried $WCM_XORGSDK_DEFAULT/include, $WCM_XORGSDK_DEFAULT/include/xorg, and $WCM_XORGSDK_DEFAULT/xc/include" >&5 +echo "${ECHO_T}Tried $WCM_XORGSDK_DEFAULT/include, $WCM_XORGSDK_DEFAULT/include/xorg, and $WCM_XORGSDK_DEFAULT/xc/include" >&6; } + fi + +else + XSERVER_CFLAGS=$pkg_cv_XSERVER_CFLAGS + XSERVER_LIBS=$pkg_cv_XSERVER_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + + WCM_ENV_XORGSDK=yes + WCM_XORGSDK_DIR="`$PKG_CONFIG --variable=sdkdir xorg-server`" + WCM_XORGSDK_VER="`$PKG_CONFIG --modversion xorg-server`" -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + elif test "$WCM_XORGSDK_DIR" != "no"; then + { echo "$as_me:$LINENO: checking for valid Xorg SDK" >&5 +echo $ECHO_N "checking for valid Xorg SDK... $ECHO_C" >&6; } + if test -f $WCM_XORGSDK_DIR/xf86Version.h; then + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } + WCM_ENV_XORGSDK=yes + else + { { echo "$as_me:$LINENO: error: \"provided path for Xorg SDK invalid\"" >&5 +echo "$as_me: error: \"provided path for Xorg SDK invalid\"" >&2;} + { (exit 1); exit 1; }; } + fi + fi + if test -n "$WCM_XORGSDK_DIR"; then + +cat >>confdefs.h <<\_ACEOF +#define WCM_XORG 1 +_ACEOF + + { echo "$as_me:$LINENO: checking for xserver libc-wrapper header-files" >&5 +echo $ECHO_N "checking for xserver libc-wrapper header-files... $ECHO_C" >&6; } + if test -f "$WCM_XORGSDK_DIR/xf86_libc.h"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + WCM_XDRIVER_QUIRKS="$WCM_XDRIVER_QUIRKS libc-wrapper" + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define WCM_NO_LIBCWRAPPER 1 +_ACEOF + + fi + + WCM_TABLET_SCALING= + # Check whether --enable-quirk-tablet-rescale was given. +if test "${enable_quirk_tablet_rescale+set}" = set; then + enableval=$enable_quirk_tablet_rescale; WCM_TABLET_SCALING=$enableval fi - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF + if test -z "$WCM_TABLET_SCALING"; then + # scaling quirk not needed since hardy xserver is already patched + WCM_TABLET_SCALING=no + { echo "$as_me:$LINENO: result: $WCM_TABLET_SCALING" >&5 +echo "${ECHO_T}$WCM_TABLET_SCALING" >&6; } + fi + if test "$WCM_TABLET_SCALING" = "yes"; then + WCM_XDRIVER_QUIRKS="$WCM_XDRIVER_QUIRKS tablet-screen-scaling" + +cat >>confdefs.h <<\_ACEOF +#define WCM_XORG_TABLET_SCALING 1 +_ACEOF + + fi + { echo "$as_me:$LINENO: checking if Xorg SDK defines IsXExtensionPointer" >&5 +echo $ECHO_N "checking if Xorg SDK defines IsXExtensionPointer... $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. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dnet_ntoa (); int main () { -return dnet_ntoa (); + +#include +#ifndef IsXExtensionPointer +# error "X.org SDK does not define IsXExtensionPointer" +#endif +int main(int argc, char** argv) {return 0;} + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -20460,149 +20803,209 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes + } && test -s conftest.$ac_objext; then + WCM_ISXEXTENSIONPOINTER=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dnet_stub_dnet_ntoa=no + WCM_ISXEXTENSIONPOINTER=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$save_CFLAGS" + { echo "$as_me:$LINENO: result: $WCM_ISXEXTENSIONPOINTER" >&5 +echo "${ECHO_T}$WCM_ISXEXTENSIONPOINTER" >&6; } + if test "$WCM_ISXEXTENSIONPOINTER" = "yes"; then + WCM_XDRIVER_QUIRKS="$WCM_XDRIVER_QUIRKS IsXExtensionPointer" + +cat >>confdefs.h <<\_ACEOF +#define WCM_ISXEXTENSIONPOINTER 1 +_ACEOF + + fi + + case "$WCM_XORGSDK_VER" in + 1.0*|1.1*|1.2*|1.3*) + ;; + 1.*|2*) + WCM_CLEVEL=-std=c99;; + *) + ;; + esac + fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" + if test "$WCM_ENV_XORGSDK" = yes; then + WCM_ENV_XORGSDK_TRUE= + WCM_ENV_XORGSDK_FALSE='#' +else + WCM_ENV_XORGSDK_TRUE='#' + WCM_ENV_XORGSDK_FALSE= fi - fi -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" +# Define X_CFLAGS, X_LIBS, X_EXTRA_LIBS and X_PRELIBS as required if X +# is found, else defines X_DISPLAY_MISSING. We need at least X_CFLAGS. +{ echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6; } - # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - { echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } -if test "${ac_cv_func_gethostbyname+set}" = set; then + +# Check whether --with-x was given. +if test "${with_x+set}" = set; then + withval=$with_x; +fi + +# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +if test "x$with_x" = xno; then + # The user explicitly disabled X. + have_x=disabled +else + case $x_includes,$x_libraries in #( + *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 +echo "$as_me: error: Cannot use X directory names containing '" >&2;} + { (exit 1); exit 1; }; };; #( + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + # One or both of the vars are not set, and there is no cached value. +ac_x_includes=no ac_x_libraries=no +rm -f -r conftest.dir +if mkdir conftest.dir; then + cd conftest.dir + cat >Imakefile <<'_ACEOF' +incroot: + @echo incroot='${INCROOT}' +usrlibdir: + @echo usrlibdir='${USRLIBDIR}' +libdir: + @echo libdir='${LIBDIR}' _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. + for ac_extension in a so sl; do + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then + ac_im_usrlibdir=$ac_im_libdir; break + fi + done + # Screen out bogus values from the imake configuration. They are + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. + case $ac_im_incroot in + /usr/include) ac_x_includes= ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in + /usr/lib | /lib) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi + cd .. + rm -f -r conftest.dir +fi -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +# Standard set of common directories for X headers. +# Check X11 before X11Rn because it is often a symlink to the current release. +ac_x_header_dirs=' +/usr/X11/include +/usr/X11R6/include +/usr/X11R5/include +/usr/X11R4/include -#ifdef __STDC__ -# include -#else -# include -#endif +/usr/include/X11 +/usr/include/X11R6 +/usr/include/X11R5 +/usr/include/X11R4 -#undef gethostbyname +/usr/local/X11/include +/usr/local/X11R6/include +/usr/local/X11R5/include +/usr/local/X11R4/include -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_gethostbyname || defined __stub___gethostbyname -choke me -#endif +/usr/local/include/X11 +/usr/local/include/X11R6 +/usr/local/include/X11R5 +/usr/local/include/X11R4 -int -main () -{ -return gethostbyname (); - ; - return 0; -} +/usr/X386/include +/usr/x386/include +/usr/XFree86/include/X11 + +/usr/include +/usr/local/include +/usr/unsupported/include +/usr/athena/include +/usr/local/x11r5/include +/usr/lpp/Xamples/include + +/usr/openwin/include +/usr/openwin/share/include' + +if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_cpp conftest.$ac_ext") 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); } && { - test -z "$ac_c_werror_flag" || + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_gethostbyname=yes + }; then + # We can compile using X headers with no special include directory. +ac_x_includes= else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_gethostbyname=no + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +done fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } +rm -f conftest.err conftest.$ac_ext +fi # $ac_x_includes = no - if test $ac_cv_func_gethostbyname = no; then - { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF +if test "$ac_x_libraries" = no; then + # Check for the libraries. + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS + LIBS="-lX11 $LIBS" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); +#include int main () { -return gethostbyname (); +XrmInitialize () ; return 0; } @@ -20625,50 +21028,97 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_nsl_gethostbyname=yes + LIBS=$ac_save_LIBS +# We can link X programs with no special library path. +ac_x_libraries= else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_nsl_gethostbyname=no + LIBS=$ac_save_LIBS +for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl; do + if test -r "$ac_dir/libX11.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 + fi + done +done fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +fi # $ac_x_libraries = no + +case $ac_x_includes,$ac_x_libraries in #( + no,* | *,no | *\'*) + # Didn't find X, or a directory has "'" in its name. + ac_cv_have_x="have_x=no";; #( + *) + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$ac_x_includes'\ + ac_x_libraries='$ac_x_libraries'" +esac fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } -if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" +;; #( + *) have_x=yes;; + esac + eval "$ac_cv_have_x" +fi # $with_x != no + +if test "$have_x" != yes; then + { echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6; } + no_x=yes +else + # If each of the values was on the command line, it overrides each guess. + test "x$x_includes" = xNONE && x_includes=$ac_x_includes + test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" + { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } fi - if test $ac_cv_lib_nsl_gethostbyname = no; then - { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + +cat >>confdefs.h <<\_ACEOF +#define X_DISPLAY_MISSING 1 +_ACEOF + + X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF + if test -n "$x_includes"; then + X_CFLAGS="$X_CFLAGS -I$x_includes" + fi + + # It would also be nice to do this for all -L options, not just this one. + if test -n "$x_libraries"; then + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . + { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 +echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + ac_xsave_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); int main () { -return gethostbyname (); + ; return 0; } @@ -20691,80 +21141,25 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_bsd_gethostbyname=yes + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + X_LIBS="$X_LIBS -R$x_libraries" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_bsd_gethostbyname=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } -if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - - fi - fi - - # lieder@skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the name server (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - { echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6; } -if test "${ac_cv_func_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef connect - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char connect (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_connect || defined __stub___connect -choke me -#endif int main () { -return connect (); + ; return 0; } @@ -20787,29 +21182,39 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_func_connect=yes + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + X_LIBS="$X_LIBS -R $x_libraries" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_connect=no + { echo "$as_me:$LINENO: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6; } - if test $ac_cv_func_connect = no; then - { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_c_werror_flag=$ac_xsave_c_werror_flag + LIBS=$ac_xsave_LIBS + fi + + # Check for system-dependent libraries X programs must link with. + # Do this before checking for the system-independent R6 libraries + # (-lICE), since we may need -lsocket or whatever for X linking. + + if test "$ISC" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" + else + # Martyn Johnson says this is needed for Ultrix, if the X + # libraries were built with DECnet support. And Karl Berry says + # the Alpha needs dnet_stub (dnet does not exist). + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20822,11 +21227,11 @@ #ifdef __cplusplus extern "C" #endif -char connect (); +char XOpenDisplay (); int main () { -return connect (); +return XOpenDisplay (); ; return 0; } @@ -20849,73 +21254,36 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_socket_connect=yes + : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_socket_connect=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } -if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - { echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6; } -if test "${ac_cv_func_remove+set}" = set; then + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldnet $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef remove /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char remove (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_remove || defined __stub___remove -choke me + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" #endif - +char dnet_ntoa (); int main () { -return remove (); +return dnet_ntoa (); ; return 0; } @@ -20938,28 +21306,32 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_func_remove=yes + ac_cv_lib_dnet_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_remove=no + ac_cv_lib_dnet_dnet_ntoa=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } +if test $ac_cv_lib_dnet_dnet_ntoa = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6; } - if test $ac_cv_func_remove = no; then - { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } -if test "${ac_cv_lib_posix_remove+set}" = set; then + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" +LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20973,11 +21345,11 @@ #ifdef __cplusplus extern "C" #endif -char remove (); +char dnet_ntoa (); int main () { -return remove (); +return dnet_ntoa (); ; return 0; } @@ -21000,30 +21372,42 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_posix_remove=yes + ac_cv_lib_dnet_stub_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_posix_remove=no + ac_cv_lib_dnet_stub_dnet_ntoa=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } -if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi +fi - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - { echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } -if test "${ac_cv_func_shmat+set}" = set; then +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" + + # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, + # to get the SysV transport functions. + # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) + # needs -lnsl. + # The nsl library prevents programs from opening the X display + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. + { echo "$as_me:$LINENO: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } +if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -21032,12 +21416,12 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define shmat to an innocuous variant, in case declares shmat. +/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat +#define gethostbyname innocuous_gethostbyname /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. + which can conflict with char gethostbyname (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ @@ -21047,7 +21431,7 @@ # include #endif -#undef shmat +#undef gethostbyname /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -21055,18 +21439,18 @@ #ifdef __cplusplus extern "C" #endif -char shmat (); +char gethostbyname (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined __stub_shmat || defined __stub___shmat +#if defined __stub_gethostbyname || defined __stub___gethostbyname choke me #endif int main () { -return shmat (); +return gethostbyname (); ; return 0; } @@ -21089,28 +21473,28 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_func_shmat=yes + ac_cv_func_gethostbyname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_shmat=no + ac_cv_func_gethostbyname=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } - if test $ac_cv_func_shmat = no; then - { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } -if test "${ac_cv_lib_ipc_shmat+set}" = set; then + if test $ac_cv_func_gethostbyname = no; then + { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" +LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21124,11 +21508,11 @@ #ifdef __cplusplus extern "C" #endif -char shmat (); +char gethostbyname (); int main () { -return shmat (); +return gethostbyname (); ; return 0; } @@ -21151,43 +21535,32 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_ipc_shmat=yes + ac_cv_lib_nsl_gethostbyname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ipc_shmat=no + ac_cv_lib_nsl_gethostbyname=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } -if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } +if test $ac_cv_lib_nsl_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + if test $ac_cv_lib_nsl_gethostbyname = no; then + { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" +LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21201,11 +21574,11 @@ #ifdef __cplusplus extern "C" #endif -char IceConnectionNumber (); +char gethostbyname (); int main () { -return IceConnectionNumber (); +return gethostbyname (); ; return 0; } @@ -21228,282 +21601,154 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_ICE_IceConnectionNumber=yes + ac_cv_lib_bsd_gethostbyname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ICE_IceConnectionNumber=no + ac_cv_lib_bsd_gethostbyname=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -fi - - LDFLAGS=$ac_save_LDFLAGS - -fi - - -{ echo "$as_me:$LINENO: checking for stack-protector flags support in $CC" >&5 -echo $ECHO_N "checking for stack-protector flags support in $CC... $ECHO_C" >&6; } -if $CC -dumpspecs | grep stack-protector >/dev/null 2>&1; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - WCM_CFLAGS_STACK_PROTECTOR="-fno-stack-protector" -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - WCM_CFLAGS_STACK_PROTECTOR="" -fi - - - -WCM_XLIBDIR= - -# Check whether --with-xlib was given. -if test "${with_xlib+set}" = set; then - withval=$with_xlib; WCM_XLIBDIR=$withval -fi - - -{ echo "$as_me:$LINENO: checking for X lib directory" >&5 -echo $ECHO_N "checking for X lib directory... $ECHO_C" >&6; } - -if test -d $WCM_XLIBDIR && test -f $WCM_XLIBDIR/libX11.so; then - WCM_ENV_XLIB=yes - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } -elif test -f $WCM_XLIBDIR_DEFAULT2/libX11.so; then - WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } -elif test -d $WCM_XLIBDIR_DEFAULT/X11 || - test -d $WCM_XLIBDIR_DEFAULT; then - WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } -else - { echo "$as_me:$LINENO: result: not found, tried $WCM_XLIBDIR_DEFAULT/X11 and $WCM_XLIBDIR_DEFAULT2" >&5 -echo "${ECHO_T}not found, tried $WCM_XLIBDIR_DEFAULT/X11 and $WCM_XLIBDIR_DEFAULT2" >&6; } - WCM_ENV_XLIB=no -fi - - -WCM_TCLDIR= - -# Check whether --with-tcl was given. -if test "${with_tcl+set}" = set; then - withval=$with_tcl; WCM_TCLDIR=$withval +{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } +if test $ac_cv_lib_bsd_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi + fi + fi -# Extract the first word of "tclsh", so it can be a program name with args. -set dummy tclsh; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_TCLSH+set}" = set; then + # lieder@skyler.mavd.honeywell.com says without -lsocket, + # socket/setsockopt and other routines are undefined under SCO ODT + # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary + # on later versions), says Simon Leinen: it contains gethostby* + # variants that don't use the name server (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. + { echo "$as_me:$LINENO: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6; } +if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $TCLSH in - [\\/]* | ?:[\\/]*) - ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_TCLSH" && ac_cv_path_TCLSH="no" - ;; -esac -fi -TCLSH=$ac_cv_path_TCLSH -if test -n "$TCLSH"; then - { echo "$as_me:$LINENO: result: $TCLSH" >&5 -echo "${ECHO_T}$TCLSH" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -if test "x$TCLSH" != "xno"; then - { echo "$as_me:$LINENO: checking for tcl version" >&5 -echo $ECHO_N "checking for tcl version... $ECHO_C" >&6; } - version=$(echo "puts [set tcl_version]" | $TCLSH) - { echo "$as_me:$LINENO: result: $version" >&5 -echo "${ECHO_T}$version" >&6; } -fi - -if test "$WCM_TCLDIR" = "yes" || test "$WCM_TCLDIR" == ""; then - { echo "$as_me:$LINENO: checking for tcl header files" >&5 -echo $ECHO_N "checking for tcl header files... $ECHO_C" >&6; } - dir="$WCM_TCLTKDIR_DEFAULT/include"; - for i in "" tcl/ "tcl$version/"; do - if test "x$WCM_ENV_TCL" != "xyes"; then - if test -f "$dir/$i/tcl.h"; then - { echo "$as_me:$LINENO: result: $dir/$i" >&5 -echo "${ECHO_T}$dir/$i" >&6; } - WCM_ENV_TCL=yes - WCM_TCLDIR="$dir/$i" - CFLAGS="$CFLAGS -I$WCM_TCLDIR" - fi - fi - done - if test "x$WCM_ENV_TCL" != "xyes"; then - { echo "$as_me:$LINENO: result: not found; tried $WCM_TCLTKDIR_DEFAULT/include, tcl, and \"tcl$version\"; " >&5 -echo "${ECHO_T}not found; tried $WCM_TCLTKDIR_DEFAULT/include, tcl, and \"tcl$version\"; " >&6; } - echo "***"; echo "*** WARNING:" - echo "*** The tcl development environment does not appear to" - echo "*** be installed. The header file tcl.h does not appear" - echo "*** in the include path. Do you have the tcl rpm or" - echo "*** equivalent package properly installed? Some build" - echo "*** features will be unavailable." - echo "***" - fi + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define connect to an innocuous variant, in case declares connect. + For example, HP-UX 11i declares gettimeofday. */ +#define connect innocuous_connect -elif test "$WCM_TCLDIR" != "no"; then - { echo "$as_me:$LINENO: checking for tcl header files" >&5 -echo $ECHO_N "checking for tcl header files... $ECHO_C" >&6; } - if test -f "$WCM_TCLDIR/include/tcl.h"; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } - WCM_ENV_TCL=yes - if test "$WCM_TCLDIR" != "/usr"; then - CFLAGS="$CFLAGS -I$WCM_TCLDIR/include" - fi - elif test -f "$WCM_TCLDIR/tcl.h"; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } - WCM_ENV_TCL=yes - if test "$WCM_TCLDIR" != "/usr"; then - CFLAGS="$CFLAGS -I$WCM_TCLDIR" - fi - else - { echo "$as_me:$LINENO: result: not found; tried $WCM_TCLDIR/include/tcl.h and $WCM_TCLDIR/tcl.h" >&5 -echo "${ECHO_T}not found; tried $WCM_TCLDIR/include/tcl.h and $WCM_TCLDIR/tcl.h" >&6; } - echo "***"; echo "*** WARNING:" - echo "*** The tcl development environment does not appear to" - echo "*** be installed. The header file tcl.h does not appear" - echo "*** in the include path. Do you have the tcl rpm or" - echo "*** equivalent package properly installed? Some build" - echo "*** features will be unavailable." - echo "***" - fi -fi +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char connect (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif -WCM_TKDIR= +#undef connect -# Check whether --with-tk was given. -if test "${with_tk+set}" = set; then - withval=$with_tk; WCM_TKDIR=$withval -fi +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char connect (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_connect || defined __stub___connect +choke me +#endif +int +main () +{ +return connect (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_connect=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -if test "$WCM_TKDIR" = "yes" || test "$WCM_TKDIR" == ""; then - { echo "$as_me:$LINENO: checking for tk header files" >&5 -echo $ECHO_N "checking for tk header files... $ECHO_C" >&6; } - if test -f "$WCM_TCLTKDIR_DEFAULT/include/tk.h"; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } - WCM_ENV_TK=yes - WCM_TKDIR="$WCM_TCLTKDIR_DEFAULT/include" - elif test -f "$WCM_TCLDIR/include/tk.h" || test -f "$WCM_TCLDIR/tk.h"; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } - WCM_ENV_TK=yes - WCM_TKDIR="$WCM_TCLDIR" - else - { echo "$as_me:$LINENO: result: not found; tried $WCM_TCLTKDIR_DEFAULT/include and $WCM_TCLDIR/include" >&5 -echo "${ECHO_T}not found; tried $WCM_TCLTKDIR_DEFAULT/include and $WCM_TCLDIR/include" >&6; } - echo "***"; echo "*** WARNING:" - echo "*** The tk development environment does not appear to" - echo "*** be installed. The header file tk.h does not appear" - echo "*** in the include path. Do you have the tk rpm or" - echo "*** equivalent package properly installed? Some build" - echo "*** features will be unavailable." - echo "***" - fi -elif test "$WCM_TKDIR" != "no"; then - { echo "$as_me:$LINENO: checking for tk header files" >&5 -echo $ECHO_N "checking for tk header files... $ECHO_C" >&6; } - if test -f "$WCM_TKDIR/include/tk.h"; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } - WCM_ENV_TK=yes - if test "$WCM_TCLDIR" != "$WCM_TKDIR" && test "$WCM_TKDIR" != "/usr"; then - CFLAGS="$CFLAGS -I$WCM_TKDIR/include" - fi - elif test -f "$WCM_TKDIR/tk.h"; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } - WCM_ENV_TK=yes - if test "$WCM_TCLDIR" != "$WCM_TKDIR" && test "$WCM_TKDIR" != "/usr"; then - CFLAGS="$CFLAGS -I$WCM_TKDIR" - fi - else - { echo "$as_me:$LINENO: result: not found; tried $WCM_TKDIR/include/tk.h and $WCM_TKDIR/tk.h" >&5 -echo "${ECHO_T}not found; tried $WCM_TKDIR/include/tk.h and $WCM_TKDIR/tk.h" >&6; } - echo "***"; echo "*** WARNING:" - echo "*** The tk library does not appear to be installed." - echo "*** Do you have the tk rpm or equivalent package properly" - echo "*** installed? Some build features will be unavailable." - echo "***" - fi + ac_cv_func_connect=no fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6; } - -if test "${ac_cv_header_ncurses_h+set}" = set; then - { echo "$as_me:$LINENO: checking for ncurses.h" >&5 -echo $ECHO_N "checking for ncurses.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ncurses_h+set}" = set; then + if test $ac_cv_func_connect = no; then + { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } +if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_h" >&5 -echo "${ECHO_T}$ac_cv_header_ncurses_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ncurses.h usability" >&5 -echo $ECHO_N "checking ncurses.h usability... $ECHO_C" >&6; } + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char connect (); +int +main () +{ +return connect (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -21512,129 +21757,238 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_socket_connect=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_lib_socket_connect=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } +if test $ac_cv_lib_socket_connect = yes; then + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +fi -# Is the header present? -{ echo "$as_me:$LINENO: checking ncurses.h presence" >&5 -echo $ECHO_N "checking ncurses.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. + { echo "$as_me:$LINENO: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6; } +if test "${ac_cv_func_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +/* Define remove to an innocuous variant, in case declares remove. + For example, HP-UX 11i declares gettimeofday. */ +#define remove innocuous_remove + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char remove (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef remove + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char remove (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_remove || defined __stub___remove +choke me +#endif + +int +main () +{ +return remove (); + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_link") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err - }; then - ac_header_preproc=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_remove=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + ac_cv_func_remove=no fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ncurses.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ncurses.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ncurses.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ncurses.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ncurses.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ncurses.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ncurses.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ncurses.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ncurses.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ncurses.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ncurses.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ncurses.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ncurses.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ncurses.h: in the future, the compiler will take precedence" >&2;} + if test $ac_cv_func_remove = no; then + { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } +if test "${ac_cv_lib_posix_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lposix $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - ;; +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char remove (); +int +main () +{ +return remove (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -{ echo "$as_me:$LINENO: checking for ncurses.h" >&5 -echo $ECHO_N "checking for ncurses.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ncurses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_posix_remove=yes else - ac_cv_header_ncurses_h=$ac_header_preproc + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_posix_remove=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_h" >&5 -echo "${ECHO_T}$ac_cv_header_ncurses_h" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if test $ac_cv_header_ncurses_h = yes; then - WCM_ENV_NCURSES=yes +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } +if test $ac_cv_lib_posix_remove = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi + fi -if test x$WCM_ENV_NCURSES != xyes; then - if test "${ac_cv_header_ncurses_ncurses_h+set}" = set; then - { echo "$as_me:$LINENO: checking for ncurses/ncurses.h" >&5 -echo $ECHO_N "checking for ncurses/ncurses.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ncurses_ncurses_h+set}" = set; then + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + { echo "$as_me:$LINENO: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } +if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_ncurses_h" >&5 -echo "${ECHO_T}$ac_cv_header_ncurses_ncurses_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ncurses/ncurses.h usability" >&5 -echo $ECHO_N "checking ncurses/ncurses.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include +/* Define shmat to an innocuous variant, in case declares shmat. + For example, HP-UX 11i declares gettimeofday. */ +#define shmat innocuous_shmat + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shmat (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef shmat + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shmat (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_shmat || defined __stub___shmat +choke me +#endif + +int +main () +{ +return shmat (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -21643,885 +21997,864 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_shmat=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_func_shmat=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking ncurses/ncurses.h presence" >&5 -echo $ECHO_N "checking ncurses/ncurses.h presence... $ECHO_C" >&6; } + if test $ac_cv_func_shmat = no; then + { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } +if test "${ac_cv_lib_ipc_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shmat (); +int +main () +{ +return shmat (); + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_link") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err - }; then - ac_header_preproc=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_ipc_shmat=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ncurses/ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ncurses/ncurses.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ncurses/ncurses.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ncurses/ncurses.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ncurses/ncurses.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ncurses/ncurses.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ncurses/ncurses.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ncurses/ncurses.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for ncurses/ncurses.h" >&5 -echo $ECHO_N "checking for ncurses/ncurses.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ncurses_ncurses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_ncurses_ncurses_h=$ac_header_preproc + ac_cv_lib_ipc_shmat=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_ncurses_h" >&5 -echo "${ECHO_T}$ac_cv_header_ncurses_ncurses_h" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if test $ac_cv_header_ncurses_ncurses_h = yes; then - WCM_ENV_NCURSES=yes +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } +if test $ac_cv_lib_ipc_shmat = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi + fi + fi -fi -if test x$WCM_ENV_NCURSES != xyes; then - echo "***"; echo "*** WARNING:" - echo "*** The ncurses development library does not appear to be installed." - echo "*** The header file ncurses.h does not appear in the include path." - echo "*** Do you have the ncurses-devel rpm or equivalent package" - echo "*** properly installed? Some build features will be unavailable." - echo "***" + # Check for libraries that X11R6 Xt/Xaw programs need. + ac_save_LDFLAGS=$LDFLAGS + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" + # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to + # check for ICE first), but we must link in the order -lSM -lICE or + # we get undefined symbols. So assume we have SM if we have ICE. + # These have to be linked with before -lX11, unlike the other + # libraries we check for below, so use a different variable. + # John Interrante, Karl Berry + { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lICE $X_EXTRA_LIBS $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -cat >>confdefs.h <<\_ACEOF -#define WCM_ENABLE_NCURSES 0 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char IceConnectionNumber (); +int +main () +{ +return IceConnectionNumber (); + ; + return 0; +} _ACEOF - +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_ICE_IceConnectionNumber=yes else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -cat >>confdefs.h <<\_ACEOF -#define WCM_ENABLE_NCURSES 1 -_ACEOF - + ac_cv_lib_ICE_IceConnectionNumber=no fi - -if test x$WCM_ENV_NCURSES = xyes; then - WCM_ENV_NCURSES_TRUE= - WCM_ENV_NCURSES_FALSE='#' -else - WCM_ENV_NCURSES_TRUE='#' - WCM_ENV_NCURSES_FALSE= +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - - - -WCM_OPTION_WACOM=no -# Check whether --enable-wacom was given. -if test "${enable_wacom+set}" = set; then - enableval=$enable_wacom; -else - enable_wacom=no +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi -if test "$enable_wacom" != "no"; then - if test "$WCM_ENV_KERNEL" != "yes"; then - echo "***"; echo "*** WARNING:"; - echo "*** Unable to compile wacom.o without kernel build environment" - echo "*** wacom.o will not be built" - echo "***" - else - WCM_OPTION_WACOM=yes - WCM_MODULES="$WCM_MODULES wacom.o" - fi -fi + LDFLAGS=$ac_save_LDFLAGS -WCM_OPTION_WACDUMP=no -# Check whether --enable-wacdump was given. -if test "${enable_wacdump+set}" = set; then - enableval=$enable_wacdump; -else - enable_wacdump=yes fi -if test "$enable_wacdump" != "no"; then - if test x$WCM_ENV_NCURSES != xyes; then - echo "***"; echo "*** WARNING:"; - echo "*** Unable to compile wacdump without ncurses environment" - echo "*** wacdump will not be built" - echo "***" - else - WCM_OPTION_WACDUMP=yes - WCM_PROGS="$WCM_PROGS wacdump" - fi -fi -WCM_PATCH_XIDUMP= -WCM_OPTION_XIDUMP=no -# Check whether --enable-xidump was given. -if test "${enable_xidump+set}" = set; then - enableval=$enable_xidump; +WCM_ENV_TCL=no +WCM_TCL_DIR= +WCM_TCL_CFLAGS= +# Extract the first word of "tclsh", so it can be a program name with args. +set dummy tclsh; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_TCLSH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - enable_xidump=$WCM_XIDUMP_DEFAULT -fi + case $TCLSH in + [\\/]* | ?:[\\/]*) + ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -if test "$enable_xidump" != "no"; then - if test x$WCM_ENV_XLIB != xyes; then - echo "***"; echo "*** WARNING:"; - echo "*** xidump requires XLib environment; xidump will not be built." - echo "***" - else - if test x$WCM_ENV_NCURSES != xyes; then - echo "***"; echo "*** WARNING:"; - echo "*** xidump will build without ncurses support." - echo "***" - WCM_PATCH_XIDUMP="(no ncurses) $WCM_PATCH_XIDUMP" - fi - WCM_OPTION_XIDUMP=yes - WCM_XIDUMP_LIBS="-L$WCM_XLIBDIR -lX11 -lXi -lm" - WCM_PROGS="$WCM_PROGS xidump" - fi + test -z "$ac_cv_path_TCLSH" && ac_cv_path_TCLSH="no" + ;; +esac fi - -WCM_OPTION_LIBWACOMCFG=no -# Check whether --enable-libwacomcfg was given. -if test "${enable_libwacomcfg+set}" = set; then - enableval=$enable_libwacomcfg; +TCLSH=$ac_cv_path_TCLSH +if test -n "$TCLSH"; then + { echo "$as_me:$LINENO: result: $TCLSH" >&5 +echo "${ECHO_T}$TCLSH" >&6; } else - enable_libwacomcfg=yes -fi - -if test "$enable_libwacomcfg" != "no"; then - if test x$WCM_ENV_XLIB != xyes; then - echo "***"; echo "*** WARNING:"; - echo "*** libwacomcfg requires XLib environment; libwacomcfg will not be built." - echo "***" - else - WCM_OPTION_LIBWACOMCFG=yes - WCM_LIBWACOMCFG_LIBS="-L$WCM_XLIBDIR -lX11 -lXi" - WCM_LIBS="$WCM_LIBS libwacomcfg.la" - fi + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -WCM_OPTION_XSETWACOM=no -# Check whether --enable-xsetwacom was given. -if test "${enable_xsetwacom+set}" = set; then - enableval=$enable_xsetwacom; -else - enable_xsetwacom=yes -fi -if test "$enable_xsetwacom" != "no"; then - if test x$WCM_OPTION_LIBWACOMCFG != xyes; then - echo "***"; echo "*** WARNING:"; - echo "*** xsetwacom requires libwacomcfg; xsetwacom will not be built." - echo "***" - else - WCM_OPTION_XSETWACOM=yes - WCM_XSETWACOM_LIBS="-L$WCM_XLIBDIR -lX11 -lXi" - WCM_PROGS="$WCM_PROGS xsetwacom" - fi +if test "x$TCLSH" != "xno"; then + { echo "$as_me:$LINENO: checking for tcl version" >&5 +echo $ECHO_N "checking for tcl version... $ECHO_C" >&6; } + version=$(echo "puts [set tcl_version]" | $TCLSH) + { echo "$as_me:$LINENO: result: $version" >&5 +echo "${ECHO_T}$version" >&6; } fi -WCM_WACOMXI_BINDIR=$WCM_EXECDIR/bin -WCM_WACOMXI_LIBDIR=$WCM_EXECDIR/lib - -WCM_OPTION_LIBWACOMXI=no -# Check whether --enable-libwacomxi was given. -if test "${enable_libwacomxi+set}" = set; then - enableval=$enable_libwacomxi; -else - enable_libwacomxi=yes +# Check whether --with-tcl was given. +if test "${with_tcl+set}" = set; then + withval=$with_tcl; WCM_TCL_DIR=$withval fi -if test "$enable_libwacomxi" != "no"; then - if test x$WCM_ENV_XLIB != xyes; then - echo "***"; echo "*** WARNING:"; - echo "*** libwacomxi requires XLib environment; libwacomxi will not be built." - echo "***" - elif test x$WCM_ENV_TCL != xyes; then - echo "***"; echo "*** WARNING:"; - echo "*** libwacomxi requires tcl environment; libwacomxi will not be built." - echo "***" - elif test x$WCM_ENV_TK != xyes; then - echo "***"; echo "*** WARNING:"; - echo "*** libwacomxi requires tk environment; libwacomxi will not be built." - echo "***" - else - WCM_OPTION_LIBWACOMXI=yes - WCM_WACOMXI_LIBS="-L$WCM_XLIBDIR -lX11 -lXi" - WCM_TCLLIBS="$WCM_TCLLIBS libwacomxi.la" - WCM_TCLPKGS="$WCM_TCLPCKS pkgIndex.tcl" +if test "$WCM_TCL_DIR" = yes -o -z "$WCM_TCL_DIR"; then + { echo "$as_me:$LINENO: checking for tcl header files" >&5 +echo $ECHO_N "checking for tcl header files... $ECHO_C" >&6; } + for i in /usr/include /usr/include/tcl "/usr/include/tcl$version"; do + if test -f "$i/tcl.h"; then + { echo "$as_me:$LINENO: result: found, $i" >&5 +echo "${ECHO_T}found, $i" >&6; } + WCM_ENV_TCL=yes + WCM_TCL_DIR="$i" + WCM_TCL_CFLAGS="-I$WCM_TCL_DIR" + CFLAGS="$CFLAGS $WCM_TCL_CFLAGS" + break + fi + done + if test "$WCM_ENV_TCL" != yes; then + { echo "$as_me:$LINENO: WARNING: not found; tried /usr/include, tcl, and tcl$version; " >&5 +echo "$as_me: WARNING: not found; tried /usr/include, tcl, and tcl$version; " >&2;} + fi +elif test "$WCM_TCL_DIR" != no; then + { echo "$as_me:$LINENO: checking for tcl header files" >&5 +echo $ECHO_N "checking for tcl header files... $ECHO_C" >&6; } + for i in include .; do + if test -f "$WCM_TCL_DIR/$i/tcl.h"; then + { echo "$as_me:$LINENO: result: found, " >&5 +echo "${ECHO_T}found, " >&6; } + WCM_ENV_TCL=yes + if test "$WCM_TCL_DIR" != "/usr"; then + WCM_TCL_CFLAGS="-I$WCM_TCL_DIR/$i" + CFLAGS="$CFLAGS $WCM_TCL_CFLAGS" + fi + fi + done + if test "$WCM_ENV_TCL" != yes; then + { echo "$as_me:$LINENO: result: not found; tried $WCM_TCL_DIR/include/tcl.h and $WCM_TCL_DIR/tcl.h" >&5 +echo "${ECHO_T}not found; tried $WCM_TCL_DIR/include/tcl.h and $WCM_TCL_DIR/tcl.h" >&6; } + WCM_TCL_DIR= fi fi - - - -if test "$WCM_OPTION_LIBWACOMXI" == "yes"; then - WACOMXI_INSTALL_TRUE= - WACOMXI_INSTALL_FALSE='#' -else - WACOMXI_INSTALL_TRUE='#' - WACOMXI_INSTALL_FALSE= +if test "$WCM_ENV_TCL" != yes; then + echo "***" + echo "*** The tcl development environment can not be found." + echo "*** The header file tcl.h does not appear at the normal" + echo "*** (or provided) include path. Some build features" + echo "*** will be unavailable." + echo "***" fi +WCM_ENV_TK=no +WCM_TK_DIR= +WCM_TK_CFLAGS= -WCM_OPTION_HID=no -# Check whether --enable-hid was given. -if test "${enable_hid+set}" = set; then - enableval=$enable_hid; -else - enable_hid=no +# Check whether --with-tk was given. +if test "${with_tk+set}" = set; then + withval=$with_tk; WCM_TK_DIR=$withval fi -if test "$enable_hid" != "no"; then - kver=`echo $WCM_KERNEL_VER | grep "2.6"` - kver=`echo $kver | cut -f 3 -d.` - if test $kver -ge 18; then - echo "***"; echo "*** WARNING:"; - echo "*** No need to build (usb)hid.ko for kernel 2.6.18 or later" - echo "***" - else - kver=`echo $WCM_KERNEL_VER | grep -c "2.4"` - if test "$WCM_ENV_KERNEL" != "yes"; then - echo "***"; echo "*** WARNING:"; - echo "*** Unable to compile hid.o without kernel build environment" - echo "*** hid.o will not be built" - echo "***" - else - WCM_OPTION_HID=yes - if test $kver != 0; then - if test "$WCM_KERNEL_VER" = "2.4.22"; then - cp $WCM_KERNELDIR/drivers/usb/hid-input.c src/$WCM_KERNEL_VER - cp $WCM_KERNELDIR/drivers/usb/hiddev.c src/$WCM_KERNEL_VER - fi +if test "$WCM_TK_DIR" = yes -o -z "$WCM_TK_DIR"; then + { echo "$as_me:$LINENO: checking for tk header files" >&5 +echo $ECHO_N "checking for tk header files... $ECHO_C" >&6; } + for i in $WCM_TCL_DIR /usr/include ; do + if test -f "$i/tk.h"; then + { echo "$as_me:$LINENO: result: found, $i" >&5 +echo "${ECHO_T}found, $i" >&6; } + WCM_ENV_TK=yes + WCM_TK_DIR="$i" + if test "$WCM_TCL_DIR" != "$WCM_TK_DIR" -a "$WCM_TK_DIR" != "/usr"; then + WCM_TK_CFLAGS="-I$WCM_TK_DIR" + CFLAGS="$CFLAGS $WCM_TK_CFLAGS" fi - WCM_MODULES="$WCM_MODULES hid.o" + break fi + done + if test "$WCM_ENV_TK" != yes; then + { echo "$as_me:$LINENO: WARNING: not found; tried $WCM_TCL_DIR/tk.h and /usr/include/tk.h" >&5 +echo "$as_me: WARNING: not found; tried $WCM_TCL_DIR/tk.h and /usr/include/tk.h" >&2;} fi -fi - -WCM_OPTION_USBMOUSE=no -# Check whether --enable-usbmouse was given. -if test "${enable_usbmouse+set}" = set; then - enableval=$enable_usbmouse; -else - enable_usbmouse=no -fi +elif test "$WCM_TK_DIR" != no; then + { echo "$as_me:$LINENO: checking for tk header files" >&5 +echo $ECHO_N "checking for tk header files... $ECHO_C" >&6; } -if test "$enable_usbmouse" != "no"; then - kver=`echo $WCM_KERNEL_VER | grep -c "2.4"` - if test "$WCM_ENV_KERNEL" != "yes"; then - echo "***"; echo "*** WARNING:"; - echo "*** Unable to compile usbmouse.o without kernel build environment" - echo "*** usbmouse.o will not be built" - echo "***" - elif test $kver != 0 ; then - WCM_OPTION_USBMOUSE=yes - if test "$WCM_KERNEL_VER" = "2.4.22"; then - cp $WCM_KERNELDIR/drivers/usb/usbmouse.c src/$WCM_KERNEL_VER + for i in "$WCM_TK_DIR/include" "$WCM_TK_DIR"; do + if test -f "$i/tk.h"; then + { echo "$as_me:$LINENO: result: found, $i" >&5 +echo "${ECHO_T}found, $i" >&6; } + WCM_ENV_TK=yes + WCM_TK_DIR="$i" + if test "$WCM_TCL_DIR" != "$WCM_TK_DIR" -a "$WCM_TK_DIR" != "/usr"; then + WCM_TK_CFLAGS="-I$WCM_TK_DIR" + CFLAGS="$CFLAGS $WCM_TK_CFLAGS" + fi + break fi - WCM_MODULES="$WCM_MODULES usbmouse.o" - else - echo "***"; echo "*** WARNING:"; - echo "*** No need to build usbmouse.o for kernel 2.6" - echo "***" + done + if test "$WCM_ENV_TK" != yes; then + { echo "$as_me:$LINENO: WARNING: not found; tried $WCM_TK_DIR/tk.h and $WCM_TK_DIR/include/tk.h" >&5 +echo "$as_me: WARNING: not found; tried $WCM_TK_DIR/tk.h and $WCM_TK_DIR/include/tk.h" >&2;} + WCM_TK_DIR= fi fi - -WCM_OPTION_EVDEV=no -# Check whether --enable-evdev was given. -if test "${enable_evdev+set}" = set; then - enableval=$enable_evdev; -else - enable_evdev=no +if test "$WCM_ENV_TK" != yes; then + echo "***" + echo "*** The tk development environment can not be found." + echo "*** The header file tk.h does not appear at the normal" + echo "*** (or provided) include path. Some build features" + echo "*** will be unavailable." + echo "***" fi -if test "$enable_evdev" != "no"; then - kver=`echo $WCM_KERNEL_VER | grep -c "2.4"` - if test "$WCM_ENV_KERNEL" != "yes"; then - echo "***"; echo "*** WARNING:"; - echo "*** Unable to compile evdev.o without kernel build environment" - echo "*** evdev.o will not be built" - echo "***" - elif test $kver != 0 ; then - WCM_OPTION_EVDEV=yes - WCM_MODULES="$WCM_MODULES evdev.o" - else - echo "***"; echo "*** WARNING:"; - echo "*** No need to build evdev.o for kernel 2.6" - echo "***" - fi +WCM_ENV_NCURSES=no +if test "${ac_cv_header_ncurses_h+set}" = set; then + { echo "$as_me:$LINENO: checking for ncurses.h" >&5 +echo $ECHO_N "checking for ncurses.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 fi - -WCM_OPTION_MOUSEDEV=no -# Check whether --enable-mousedev was given. -if test "${enable_mousedev+set}" = set; then - enableval=$enable_mousedev; +{ echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_h" >&5 +echo "${ECHO_T}$ac_cv_header_ncurses_h" >&6; } else - enable_mousedev=no -fi - -if test "$enable_mousedev" != "no"; then - kver=`echo $WCM_KERNEL_VER | grep -c "2.4"` - if test "$WCM_ENV_KERNEL" != "yes"; then - echo "***"; echo "*** WARNING:"; - echo "*** Unable to compile mousedev.o without kernel build environment" - echo "*** mousedev.o will not be built" - echo "***" - elif test $kver != 0 ; then - WCM_OPTION_MOUSEDEV=yes - WCM_MODULES="$WCM_MODULES mousedev.o" - else - echo "***"; echo "*** WARNING:"; - echo "*** No need to build mousedev.o for kernel 2.6" - echo "***" - fi -fi - -WCM_OPTION_INPUT=no -# Check whether --enable-input was given. -if test "${enable_input+set}" = set; then - enableval=$enable_input; + # Is the header compilable? +{ echo "$as_me:$LINENO: checking ncurses.h usability" >&5 +echo $ECHO_N "checking ncurses.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - enable_input=no -fi - -if test "$enable_input" != "no"; then - kver=`echo $WCM_KERNEL_VER | grep -c "2.4"` - if test "$WCM_ENV_KERNEL" != "yes"; then - echo "***"; echo "*** WARNING:"; - echo "*** Unable to compile input.o without kernel build environment" - echo "*** input.o will not be built" - echo "***" - elif test $kver != 0 ; then - WCM_OPTION_INPUT=yes - cp $WCM_KERNELDIR/drivers/input/input.c src/$WCM_KERNEL_VER - WCM_MODULES="$WCM_MODULES input.o" - else - echo "***"; echo "*** WARNING:"; - echo "*** No need to build input.o for kernel 2.6" - echo "***" - fi -fi - -WCM_OPTION_TABLETDEV=no -# Check whether --enable-tabletdev was given. -if test "${enable_tabletdev+set}" = set; then - enableval=$enable_tabletdev; -else - enable_tabletdev=no -fi - -if test "$enable_tabletdev" != "no"; then - if test "$WCM_ENV_KERNEL" != "yes"; then - echo "***"; echo "*** WARNING:"; - echo "*** Unable to compile tabletdev.o without kernel build environment" - echo "*** tabletdev.o will not be built" - echo "***" - else - WCM_OPTION_TABLETDEV=yes - WCM_MODULES="$WCM_MODULES tabletdev.o" - fi -fi - -WCM_MODDIR= -{ echo "$as_me:$LINENO: checking for Wacom X driver module path" >&5 -echo $ECHO_N "checking for Wacom X driver module path... $ECHO_C" >&6; } - -# Check whether --with-xmoduledir was given. -if test "${with_xmoduledir+set}" = set; then - withval=$with_xmoduledir; - WCM_MODDIR="$withval" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi -if test -n "$WCM_MODDIR"; then - WCM_OPTION_DLLOADER=yes -elif test -d $WCM_XLIBDIR/xorg/modules/input; then - WCM_MODDIR=$WCM_XLIBDIR/xorg/modules/input -elif test -d $WCM_XLIBDIR/modules/input; then - WCM_MODDIR=$WCM_XLIBDIR/modules/input -fi -{ echo "$as_me:$LINENO: result: $WCM_MODDIR" >&5 -echo "${ECHO_T}$WCM_MODDIR" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -# Check whether --enable-dlloader was given. -if test "${enable_dlloader+set}" = set; then - enableval=$enable_dlloader; +# Is the header present? +{ echo "$as_me:$LINENO: checking ncurses.h presence" >&5 +echo $ECHO_N "checking ncurses.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - enable_dlloader=$WCM_OPTION_DLLOADER -fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -#defined case -if test "$enable_dlloader" = "yes"; then - WCM_OPTION_DLLOADER=yes -else - WCM_OPTION_DLLOADER=no -fi -#usual case -if test x$enable_dlloader == x"" && test $WCM_OPTION_DLLOADER != "yes"; then - if test -f $WCM_MODDIR/wacom_drv.so; then - WCM_OPTION_DLLOADER=yes - else - WCM_OPTION_DLLOADER=no - fi + ac_header_preproc=no fi -if test $WCM_OPTION_DLLOADER == "yes"; then +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ncurses.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ncurses.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: ncurses.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ncurses.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ncurses.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ncurses.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ncurses.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ncurses.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ncurses.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ncurses.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ncurses.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ncurses.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ncurses.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ncurses.h: in the future, the compiler will take precedence" >&2;} -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + ;; +esac +{ echo "$as_me:$LINENO: checking for ncurses.h" >&5 +echo $ECHO_N "checking for ncurses.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + ac_cv_header_ncurses_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_h" >&5 +echo "${ECHO_T}$ac_cv_header_ncurses_h" >&6; } - ;; -esac fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } +if test $ac_cv_header_ncurses_h = yes; then + WCM_ENV_NCURSES=yes fi -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +if test "$WCM_ENV_NCURSES" != yes; then + if test "${ac_cv_header_ncurses_ncurses_h+set}" = set; then + { echo "$as_me:$LINENO: checking for ncurses/ncurses.h" >&5 +echo $ECHO_N "checking for ncurses/ncurses.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ncurses_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_ncurses_h" >&5 +echo "${ECHO_T}$ac_cv_header_ncurses_ncurses_h" >&6; } else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; + # Is the header compilable? +{ echo "$as_me:$LINENO: checking ncurses/ncurses.h usability" >&5 +echo $ECHO_N "checking ncurses/ncurses.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking ncurses/ncurses.h presence" >&5 +echo $ECHO_N "checking ncurses/ncurses.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - PKG_CONFIG="" - fi -fi +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -pkg_failed=no -{ echo "$as_me:$LINENO: checking for XSERVER" >&5 -echo $ECHO_N "checking for XSERVER... $ECHO_C" >&6; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ncurses/ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ncurses/ncurses.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ncurses/ncurses.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ncurses/ncurses.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ncurses/ncurses.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ncurses/ncurses.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ncurses/ncurses.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ncurses/ncurses.h: in the future, the compiler will take precedence" >&2;} -if test -n "$PKG_CONFIG"; then - if test -n "$XSERVER_CFLAGS"; then - pkg_cv_XSERVER_CFLAGS="$XSERVER_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server\"") >&5 - ($PKG_CONFIG --exists --print-errors "xorg-server") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_XSERVER_CFLAGS=`$PKG_CONFIG --cflags "xorg-server" 2>/dev/null` -else - pkg_failed=yes -fi - fi + ;; +esac +{ echo "$as_me:$LINENO: checking for ncurses/ncurses.h" >&5 +echo $ECHO_N "checking for ncurses/ncurses.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ncurses_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - pkg_failed=untried + ac_cv_header_ncurses_ncurses_h=$ac_header_preproc fi -if test -n "$PKG_CONFIG"; then - if test -n "$XSERVER_LIBS"; then - pkg_cv_XSERVER_LIBS="$XSERVER_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server\"") >&5 - ($PKG_CONFIG --exists --print-errors "xorg-server") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_XSERVER_LIBS=`$PKG_CONFIG --libs "xorg-server" 2>/dev/null` -else - pkg_failed=yes +{ echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_ncurses_h" >&5 +echo "${ECHO_T}$ac_cv_header_ncurses_ncurses_h" >&6; } + fi - fi -else - pkg_failed=untried +if test $ac_cv_header_ncurses_ncurses_h = yes; then + WCM_ENV_NCURSES=yes fi +fi +if test "$WCM_ENV_NCURSES" != yes; then + { echo "$as_me:$LINENO: WARNING: ncurses not available, ncurses UI disabled" >&5 +echo "$as_me: WARNING: ncurses not available, ncurses UI disabled" >&2;} -if test $pkg_failed = yes; then +cat >>confdefs.h <<\_ACEOF +#define WCM_ENABLE_NCURSES 0 +_ACEOF -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + if false; then + WCM_ENV_NCURSES_TRUE= + WCM_ENV_NCURSES_FALSE='#' else - _pkg_short_errors_supported=no + WCM_ENV_NCURSES_TRUE='#' + WCM_ENV_NCURSES_FALSE= fi - if test $_pkg_short_errors_supported = yes; then - XSERVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server"` - else - XSERVER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server"` - fi - # Put the nasty error message in config.log where it belongs - echo "$XSERVER_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (xorg-server) were not met: - -$XSERVER_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +else -Alternatively, you may set the environment variables XSERVER_CFLAGS -and XSERVER_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (xorg-server) were not met: +cat >>confdefs.h <<\_ACEOF +#define WCM_ENABLE_NCURSES 1 +_ACEOF -$XSERVER_PKG_ERRORS + if true; then + WCM_ENV_NCURSES_TRUE= + WCM_ENV_NCURSES_FALSE='#' +else + WCM_ENV_NCURSES_TRUE='#' + WCM_ENV_NCURSES_FALSE= +fi -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +fi -Alternatively, you may set the environment variables XSERVER_CFLAGS -and XSERVER_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables XSERVER_CFLAGS -and XSERVER_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +{ echo "$as_me:$LINENO: checking if libwacomcfg should/can be built" >&5 +echo $ECHO_N "checking if libwacomcfg should/can be built... $ECHO_C" >&6; } +WCM_OPTION_LIBWACOMCFG=no +# Check whether --enable-libwacomcfg was given. +if test "${enable_libwacomcfg+set}" = set; then + enableval=$enable_libwacomcfg; +else + enable_libwacomcfg=yes +fi -To get pkg-config, see . -See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables XSERVER_CFLAGS -and XSERVER_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +if test "$enable_libwacomcfg" != no; then + if test "$WCM_ENV_XLIB" = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + WCM_OPTION_LIBWACOMCFG=yes + WCM_LIBWACOMCFG_LIBS="-L$WCM_XLIB_DIR -lX11 -lXi" + WCM_LIBS="$WCM_LIBS libwacomcfg.la" + else + { echo "$as_me:$LINENO: WARNING: XLib environment missing, libwacomcfg not built" >&5 +echo "$as_me: WARNING: XLib environment missing, libwacomcfg not built" >&2;} + fi +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +{ echo "$as_me:$LINENO: checking if libwacomxi should/can be built" >&5 +echo $ECHO_N "checking if libwacomxi should/can be built... $ECHO_C" >&6; } +WCM_TCLLIBS= +WCM_TCLPKGS= +WCM_OPTION_LIBWACOMXI=no +# Check whether --enable-libwacomxi was given. +if test "${enable_libwacomxi+set}" = set; then + enableval=$enable_libwacomxi; else - XSERVER_CFLAGS=$pkg_cv_XSERVER_CFLAGS - XSERVER_LIBS=$pkg_cv_XSERVER_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 + enable_libwacomxi=yes +fi + +if test "$enable_libwacomxi" != no; then + if test "$WCM_ENV_XLIB" != yes; then + { echo "$as_me:$LINENO: WARNING: XLib environment missing, libwacomxi not built" >&5 +echo "$as_me: WARNING: XLib environment missing, libwacomxi not built" >&2;} + elif test "$WCM_ENV_TCL" != yes; then + { echo "$as_me:$LINENO: WARNING: tcl environment missing, libwacomxi not built" >&5 +echo "$as_me: WARNING: tcl environment missing, libwacomxi not built" >&2;} + elif test "$WCM_ENV_TK" != yes; then + { echo "$as_me:$LINENO: WARNING: tk environment missing, libwacomxi not built" >&5 +echo "$as_me: WARNING: tk environment missing, libwacomxi not built" >&2;} + else + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - : + WCM_OPTION_LIBWACOMXI=yes + WCM_WACOMXI_LIBS="-L$WCM_XLIB_DIR -lX11 -lXi" + WCM_TCLLIBS="libwacomxi.la" + WCM_TCLPKGS="pkgIndex.tcl" + fi +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "$WCM_OPTION_LIBWACOMXI" = yes ; then + WACOMXI_INSTALL_TRUE= + WACOMXI_INSTALL_FALSE='#' +else + WACOMXI_INSTALL_TRUE='#' + WACOMXI_INSTALL_FALSE= fi - -if test "$WCM_OPTION_DLLOADER" == "yes"; then - WCM_DLLOADER_TRUE= - WCM_DLLOADER_FALSE='#' +{ echo "$as_me:$LINENO: checking if wacdump should/can be built" >&5 +echo $ECHO_N "checking if wacdump should/can be built... $ECHO_C" >&6; } +WCM_OPTION_WACDUMP=no +# Check whether --enable-wacdump was given. +if test "${enable_wacdump+set}" = set; then + enableval=$enable_wacdump; else - WCM_DLLOADER_TRUE='#' - WCM_DLLOADER_FALSE= + enable_wacdump=yes fi +if test "$enable_wacdump" != "no"; then + if test "$WCM_ENV_NCURSES" = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + WCM_OPTION_WACDUMP=yes + WCM_PROGS="$WCM_PROGS wacdump" + else + { echo "$as_me:$LINENO: WARNING: ncurses environment missing, wacdump not built" >&5 +echo "$as_me: WARNING: ncurses environment missing, wacdump not built" >&2;} + fi +fi -WCM_OPTION_WACOMDRV=no -# Check whether --enable-wacomdrv was given. -if test "${enable_wacomdrv+set}" = set; then - enableval=$enable_wacomdrv; +{ echo "$as_me:$LINENO: checking if xidump should/can be built" >&5 +echo $ECHO_N "checking if xidump should/can be built... $ECHO_C" >&6; } +WCM_PATCH_XIDUMP= +WCM_OPTION_XIDUMP=no +# Check whether --enable-xidump was given. +if test "${enable_xidump+set}" = set; then + enableval=$enable_xidump; else - enable_wacomdrv=yes + enable_xidump=yes fi -if test "$enable_wacomdrv" != "no"; then - if test "$WCM_ENV_XF86" != "yes" && test "$WCM_ENV_XORGSDK" != "yes"; then - echo "***"; echo "*** WARNING:"; - echo "*** Unable to compile wacom_drv.{o,so} " - echo "*** without Xorg SDK or XFree86 build environment" - echo "*** wacom_drv.o will not be built" - echo "***" +if test "$enable_xidump" != "no"; then + if test "$WCM_ENV_XLIB" != yes; then + { echo "$as_me:$LINENO: WARNING: XLib environment missing, xidump not built" >&5 +echo "$as_me: WARNING: XLib environment missing, xidump not built" >&2;} else - WCM_OPTION_WACOMDRV=yes - if test "$WCM_OPTION_DLLOADER" == "yes" ; then - WCM_XF86MODULES="$WCM_XF86MODULES wacom_drv.so" - WCM_EXPMODULES="$WCM_EXPMODULES wacom_drv.so" + if test "$WCM_ENV_NCURSES" != yes; then + { echo "$as_me:$LINENO: result: yes, no ncurses" >&5 +echo "${ECHO_T}yes, no ncurses" >&6; } + WCM_PATCH_XIDUMP="(no ncurses)" else - WCM_XF86MODULES="$WCM_XF86MODULES wacom_drv.o" - WCM_EXPMODULES="$WCM_EXPMODULES wacom_drv.o" + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi + WCM_OPTION_XIDUMP=yes + WCM_XIDUMP_LIBS="-L$WCM_XLIB_DIR -lX11 -lXi -lm" + WCM_PROGS="$WCM_PROGS xidump" fi +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -# Check whether --enable-modver was given. -if test "${enable_modver+set}" = set; then - enableval=$enable_modver; +{ echo "$as_me:$LINENO: checking if xsetwacom should be built" >&5 +echo $ECHO_N "checking if xsetwacom should be built... $ECHO_C" >&6; } +WCM_OPTION_XSETWACOM=no +# Check whether --enable-xsetwacom was given. +if test "${enable_xsetwacom+set}" = set; then + enableval=$enable_xsetwacom; else - enable_modver=$WCM_MODVER + enable_xsetwacom=yes fi -if test "$enable_modver" = "no"; then - WCM_OPTION_MODVER=no - WCM_MODVER="" -elif test "$enable_modver" = "yes"; then - WCM_OPTION_MODVER=yes - WCM_MODVER="-DCONFIG_MODVERSIONS -DMODVERSIONS -include $WCM_KERNELDIR/include/linux/modversions.h" -else - if test "$WCM_OPTION_MODVER" = "yes"; then - WCM_MODVER="-DCONFIG_MODVERSIONS -DMODVERSIONS -include $WCM_KERNELDIR/include/linux/modversions.h" +if test "$enable_xsetwacom" != "no"; then + if test "$WCM_OPTION_LIBWACOMCFG" != yes; then + { echo "$as_me:$LINENO: WARNING: requires libwacomcfg, xsetwacom not built" >&5 +echo "$as_me: WARNING: requires libwacomcfg, xsetwacom not built" >&2;} else - WCM_MODVER="" + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + WCM_OPTION_XSETWACOM=yes + WCM_XSETWACOM_LIBS="-L$WCM_XLIB_DIR -lX11 -lXi" + WCM_PROGS="$WCM_PROGS xsetwacom" fi fi -if test "$WCM_OPTION_HID" = "yes"; then - { echo "$as_me:$LINENO: checking for updated field names in hid-core.c" >&5 -echo $ECHO_N "checking for updated field names in hid-core.c... $ECHO_C" >&6; } - HIDCORE="$WCM_KERNELDIR/drivers/usb/hid-core.c" - if test -f "$HIDCORE"; then - PATCH_DRVALUE=`grep 'dr\\.wValue' "$HIDCORE" | wc -l` - if test "$PATCH_DRVALUE" -gt 0; then - { echo "$as_me:$LINENO: result: yes, using 2.4.20 or later" >&5 -echo "${ECHO_T}yes, using 2.4.20 or later" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define WCM_PATCH_DRVALUE 1 -_ACEOF - - WCM_PATCH_HID="(value_patch) $WCM_PATCH_HID" - else - { echo "$as_me:$LINENO: result: no, using 2.4.19" >&5 -echo "${ECHO_T}no, using 2.4.19" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define WCM_PATCH_DRVALUE 0 -_ACEOF - - fi - else - HIDCORE="$WCM_KERNELDIR/drivers/usb/input/hid-core.c" - if test -f "$HIDCORE"; then - { echo "$as_me:$LINENO: result: yes, using $WCM_KERNEL_VER" >&5 -echo "${ECHO_T}yes, using $WCM_KERNEL_VER" >&6; } - else - { echo "$as_me:$LINENO: result: missing, using 2.4.19" >&5 -echo "${ECHO_T}missing, using 2.4.19" >&6; } - echo "***" - echo "*** Warning: unable to find hid-core.c in kernel tree" - echo "*** It was not possible to detect whether patches needed to be" - echo "*** applied. If the hid-core.c in this project does not build" - echo "*** correctly, you should resolve this problem first." - echo "***" - fi +{ echo "$as_me:$LINENO: checking for Wacom X driver module path" >&5 +echo $ECHO_N "checking for Wacom X driver module path... $ECHO_C" >&6; } +WCM_OPTION_DLLOADER=yes +WCM_MODDIR= -cat >>confdefs.h <<\_ACEOF -#define WCM_PATCH_DRVALUE 0 -_ACEOF +# Check whether --with-xmoduledir was given. +if test "${with_xmoduledir+set}" = set; then + withval=$with_xmoduledir; WCM_MODDIR="$withval" +fi - fi +if test -d $WCM_XLIB_DIR/xorg/modules/input; then + WCM_MODDIR=$WCM_XLIB_DIR/xorg/modules/input +elif test -d $WCM_XLIB_DIR/modules/input; then + WCM_MODDIR=$WCM_XLIB_DIR/modules/input +elif -z "$WCM_MODDIR"; then + WCM_OPTION_DLLOADER=no +fi +{ echo "$as_me:$LINENO: result: $WCM_MODDIR" >&5 +echo "${ECHO_T}$WCM_MODDIR" >&6; } - { echo "$as_me:$LINENO: checking for HID_QUIRK" >&5 -echo $ECHO_N "checking for HID_QUIRK... $ECHO_C" >&6; } - HID_H="$WCM_KERNELDIR/drivers/usb/hid.h" - if test -f "$HID_H"; then - PATCH_QUIRK=`grep 'HID_QUIRK' "$HID_H" | wc -l` - if test "$PATCH_QUIRK" -gt 0; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ echo "$as_me:$LINENO: checking for dynamic driver loading support" >&5 +echo $ECHO_N "checking for dynamic driver loading support... $ECHO_C" >&6; } +# Check whether --enable-dlloader was given. +if test "${enable_dlloader+set}" = set; then + enableval=$enable_dlloader; WCM_OPTION_DLLOADER=$enableval +fi -cat >>confdefs.h <<\_ACEOF -#define WCM_PATCH_NOQUIRK 0 -_ACEOF +if test "$WCM_OPTION_DLLOADER" = yes; then + if test -f $WCM_MODDIR/evdev_drv.so -o -f $WCM_MODDIR/kbd_drv.so -o -f $WCM_MODDIR/mouse_drv.so; then + WCM_OPTION_DLLOADER=yes + else + WCM_OPTION_DLLOADER=no + fi +fi +{ echo "$as_me:$LINENO: result: $WCM_OPTION_DLLOADER" >&5 +echo "${ECHO_T}$WCM_OPTION_DLLOADER" >&6; } + if test "$WCM_OPTION_DLLOADER" == "yes"; then + WCM_DLLOADER_TRUE= + WCM_DLLOADER_FALSE='#' +else + WCM_DLLOADER_TRUE='#' + WCM_DLLOADER_FALSE= +fi - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -cat >>confdefs.h <<\_ACEOF -#define WCM_PATCH_NOQUIRK 1 -_ACEOF +{ echo "$as_me:$LINENO: checking if wacom_drv.{o,so} should be compiled" >&5 +echo $ECHO_N "checking if wacom_drv.{o,so} should be compiled... $ECHO_C" >&6; } +WCM_OPTION_WACOMDRV=yes +# Check whether --enable-wacomdrv was given. +if test "${enable_wacomdrv+set}" = set; then + enableval=$enable_wacomdrv; WCM_OPTION_WACOMDRV=$enableval +fi - WCM_PATCH_HID="(quirk_patch) $WCM_PATCH_HID" - fi +if test "$WCM_OPTION_WACOMDRV" != "no"; then + if test "$WCM_ENV_XFREE86" != "yes" -a "$WCM_ENV_XORGSDK" != "yes"; then + { echo "$as_me:$LINENO: WARNING: requires Xorg SDK or XFree86 build environment, wacom_drv not built" >&5 +echo "$as_me: WARNING: requires Xorg SDK or XFree86 build environment, wacom_drv not built" >&2;} + WCM_OPTION_WACOMDRV=no else - HID_H="$WCM_KERNELDIR/drivers/usb/input/hid.h" - if test -f "$HID_H"; then - { echo "$as_me:$LINENO: result: missing, assuming quirks are OK" >&5 -echo "${ECHO_T}missing, assuming quirks are OK" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + WCM_OPTION_WACOMDRV=yes + if test "$WCM_OPTION_DLLOADER" == "yes" ; then + WCM_XF86MODULES="wacom_drv.so" else - echo "***" - echo "*** Warning: unable to find hid.h in kernel tree" - echo "*** It was not possible to detect whether patches needed to be" - echo "*** applied. If the hid-core.c in this project does not build" - echo "*** correctly, you should resolve this problem first." - echo "***" + WCM_XF86MODULES="wacom_drv.o" fi - -cat >>confdefs.h <<\_ACEOF -#define WCM_PATCH_NOQUIRK 0 -_ACEOF - fi +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi WCM_DEPFLAGS= # Check whether --enable-mkxincludes was given. if test "${enable_mkxincludes+set}" = set; then - enableval=$enable_mkxincludes; -else - enable_mkxincludes=no + enableval=$enable_mkxincludes; test "$enable_mkxincludes" = yes && WCM_DEPFLAGS="-MMD" fi -if test "x$enable_mkxincludes" == "xyes"; then - WCM_DEPFLAGS="-MMD" -fi -if test "x$GCC" = "xyes"; then - { echo "$as_me:$LINENO: checking if gcc accepts -fno-merge-constants" >&5 +if test "$GCC" = yes; then + OLD_CFLAGS="$CFLAGS" + { echo "$as_me:$LINENO: checking if gcc accepts -fno-merge-constants" >&5 echo $ECHO_N "checking if gcc accepts -fno-merge-constants... $ECHO_C" >&6; } - OLD_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fno-merge-constants" - cat >conftest.$ac_ext <<_ACEOF + CFLAGS="$OLD_CFLAGS -fno-merge-constants" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22553,47 +22886,250 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - has_no_merge_constants=yes + WCM_NO_MERGE_CONSTANTS="-fno-merge-constants"; { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - has_no_merge_constants=no + WCM_NO_MERGE_CONSTANTS=; { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$OLD_CFLAGS - if test "$has_no_merge_constants" = "yes" ; then - { echo "$as_me:$LINENO: result: yes" >&5 + { echo "$as_me:$LINENO: checking if gcc accepts -fno-stack-protector" >&5 +echo $ECHO_N "checking if gcc accepts -fno-stack-protector... $ECHO_C" >&6; } + CFLAGS="$OLD_CFLAGS -fno-stack-protector" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +"int main(void) { return 0; }" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + WCM_NO_STACK_PROTECTOR="-fno-stack-protector"; { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - WCM_NO_MERGE_CONSTANTS="-fno-merge-constants" - else - { echo "$as_me:$LINENO: result: no" >&5 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + WCM_NO_STACK_PROTECTOR=; { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - WCM_NO_MERGE_CONSTANTS="" - fi fi -kver=`echo $WCM_KERNEL_VER | grep -c "2.4"` -if test $kver != 0; then - WCM_ARCH=`echo $WCM_ARCH | cut -f 1 -d-` - if test "$WCM_ARCH" = "x86_64"; then - WCM_OPTION_HID=no - WCM_OPTION_WACOM=no - WCM_OPTION_INPUT=no - WCM_OPTION_USBMOUSE=no - WCM_OPTION_MOUSEDEV=no - WCM_OPTION_EVDEV=no - WCM_MODULES="" - fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$OLD_CFLAGS fi -echo + +cat >>confdefs.h <<\_ACEOF +#define AVOID_GLYPHBLT +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define _BSD_SOURCE +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define BUILDDEBUG +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define DPMSExtension +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define FUNCPROTO 15 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define GCCUSESGAS +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define _GNU_SOURCE +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define IN_MODULE +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define LBX +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define linux +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define NARROWPROTO +_ACEOF +cat >>confdefs.h <<\_ACEOF +#define NDEBUG +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define PIXPRIV +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define _POSIX_C_SOURCE +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define _POSIX_SOURCE +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define RENDER +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define SHAPE +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define SINGLEDEPTH +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define SMART_SCHEDULE +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define _SVID_SOURCE +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define TOGCUP +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define XAPPGROUP +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define X_BYTE_ORDER X_LITTLE_ENDIAN +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define XCSECURITY +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define XF86BIGFONT +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define XF86VIDMODE +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define XFree86LOADER +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define XFree86Module +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define XFree86Server +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define XFreeXDGA +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define XINPUT +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define XKB +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define _XOPEN_SOURCE +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define XResExtension +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define XvExtension +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define XvMCExtension +_ACEOF +echo + @@ -22611,7 +23147,6 @@ -#AC_SUBST(WCM_OPTION_DLLOADER) @@ -22626,7 +23161,7 @@ -ac_config_files="$ac_config_files Makefile mkxincludes src/Makefile src/util/Makefile src/xdrv/Makefile src/2.4/Makefile src/2.4.22/Makefile src/2.4.28/Makefile src/2.6.8/Makefile src/2.6.9/Makefile src/2.6.10/Makefile src/2.6.11/Makefile src/2.6.13/Makefile src/2.6.14/Makefile src/2.6.15/Makefile src/2.6.16/Makefile src/2.6.18/Makefile src/2.6.19/Makefile src/2.6.22/Makefile src/wacomxi/Makefile src/wacomxi/wacomcpl" +ac_config_files="$ac_config_files Makefile mkxincludes src/Makefile src/util/Makefile src/xdrv/Makefile src/2.4/Makefile src/2.4.22/Makefile src/2.4.28/Makefile src/2.6.8/Makefile src/2.6.9/Makefile src/2.6.10/Makefile src/2.6.11/Makefile src/2.6.13/Makefile src/2.6.14/Makefile src/2.6.15/Makefile src/2.6.16/Makefile src/2.6.18/Makefile src/2.6.19/Makefile src/2.6.22/Makefile src/2.6.24/Makefile src/wacomxi/Makefile src/wacomxi/wacomcpl" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -22752,10 +23287,17 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${WCM_ENV_XF86_TRUE}" && test -z "${WCM_ENV_XF86_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"WCM_ENV_XF86\" was never defined. +if test -z "${WCM_ENV_XFREE86_TRUE}" && test -z "${WCM_ENV_XFREE86_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WCM_ENV_XFREE86\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"WCM_ENV_XFREE86\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${WCM_ENV_XFREE86_TRUE}" && test -z "${WCM_ENV_XFREE86_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WCM_ENV_XFREE86\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"WCM_ENV_XF86\" was never defined. +echo "$as_me: error: conditional \"WCM_ENV_XFREE86\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -22773,6 +23315,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${WCM_ENV_NCURSES_TRUE}" && test -z "${WCM_ENV_NCURSES_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WCM_ENV_NCURSES\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"WCM_ENV_NCURSES\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${WACOMXI_INSTALL_TRUE}" && test -z "${WACOMXI_INSTALL_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"WACOMXI_INSTALL\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -23087,7 +23636,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by $as_me, which was +This file was extended by linuxwacom $as_me 0.7.9, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23140,7 +23689,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +linuxwacom config.status 0.7.9 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -23151,6 +23700,7 @@ ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -23253,7 +23803,9 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "src/include/xdrv-config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/include/xdrv-config.h" ;; + "src/include/kernel-config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/include/kernel-config.h" ;; + "src/include/util-config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/include/util-config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "mkxincludes") CONFIG_FILES="$CONFIG_FILES mkxincludes" ;; @@ -23274,6 +23826,7 @@ "src/2.6.18/Makefile") CONFIG_FILES="$CONFIG_FILES src/2.6.18/Makefile" ;; "src/2.6.19/Makefile") CONFIG_FILES="$CONFIG_FILES src/2.6.19/Makefile" ;; "src/2.6.22/Makefile") CONFIG_FILES="$CONFIG_FILES src/2.6.22/Makefile" ;; + "src/2.6.24/Makefile") CONFIG_FILES="$CONFIG_FILES src/2.6.24/Makefile" ;; "src/wacomxi/Makefile") CONFIG_FILES="$CONFIG_FILES src/wacomxi/Makefile" ;; "src/wacomxi/wacomcpl") CONFIG_FILES="$CONFIG_FILES src/wacomxi/wacomcpl" ;; @@ -23378,6 +23931,7 @@ INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim +am__isrc!$am__isrc$ac_delim CYGPATH_W!$CYGPATH_W$ac_delim PACKAGE!$PACKAGE$ac_delim VERSION!$VERSION$ac_delim @@ -23430,11 +23984,10 @@ ECHO!$ECHO$ac_delim AR!$AR$ac_delim RANLIB!$RANLIB$ac_delim +DSYMUTIL!$DSYMUTIL$ac_delim +NMEDIT!$NMEDIT$ac_delim CPP!$CPP$ac_delim CXX!$CXX$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$ac_delim -CXXDEPMODE!$CXXDEPMODE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -23476,6 +24029,9 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +CXXDEPMODE!$CXXDEPMODE$ac_delim am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim CXXCPP!$CXXCPP$ac_delim @@ -23483,9 +24039,14 @@ FFLAGS!$FFLAGS$ac_delim ac_ct_F77!$ac_ct_F77$ac_delim LIBTOOL!$LIBTOOL$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim WCM_LIBWACOMCFG_VER!$WCM_LIBWACOMCFG_VER$ac_delim -WCM_ENV_XF86_TRUE!$WCM_ENV_XF86_TRUE$ac_delim -WCM_ENV_XF86_FALSE!$WCM_ENV_XF86_FALSE$ac_delim +Xlib_CFLAGS!$Xlib_CFLAGS$ac_delim +Xlib_LIBS!$Xlib_LIBS$ac_delim +WCM_ENV_XFREE86_TRUE!$WCM_ENV_XFREE86_TRUE$ac_delim +WCM_ENV_XFREE86_FALSE!$WCM_ENV_XFREE86_FALSE$ac_delim +XSERVER_CFLAGS!$XSERVER_CFLAGS$ac_delim +XSERVER_LIBS!$XSERVER_LIBS$ac_delim WCM_ENV_XORGSDK_TRUE!$WCM_ENV_XORGSDK_TRUE$ac_delim WCM_ENV_XORGSDK_FALSE!$WCM_ENV_XORGSDK_FALSE$ac_delim XMKMF!$XMKMF$ac_delim @@ -23493,17 +24054,11 @@ X_PRE_LIBS!$X_PRE_LIBS$ac_delim X_LIBS!$X_LIBS$ac_delim X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim -WCM_CFLAGS_STACK_PROTECTOR!$WCM_CFLAGS_STACK_PROTECTOR$ac_delim TCLSH!$TCLSH$ac_delim WCM_ENV_NCURSES_TRUE!$WCM_ENV_NCURSES_TRUE$ac_delim WCM_ENV_NCURSES_FALSE!$WCM_ENV_NCURSES_FALSE$ac_delim -WCM_WACOMXI_BINDIR!$WCM_WACOMXI_BINDIR$ac_delim -WCM_WACOMXI_LIBDIR!$WCM_WACOMXI_LIBDIR$ac_delim WACOMXI_INSTALL_TRUE!$WACOMXI_INSTALL_TRUE$ac_delim WACOMXI_INSTALL_FALSE!$WACOMXI_INSTALL_FALSE$ac_delim -PKG_CONFIG!$PKG_CONFIG$ac_delim -XSERVER_CFLAGS!$XSERVER_CFLAGS$ac_delim -XSERVER_LIBS!$XSERVER_LIBS$ac_delim WCM_DLLOADER_TRUE!$WCM_DLLOADER_TRUE$ac_delim WCM_DLLOADER_FALSE!$WCM_DLLOADER_FALSE$ac_delim WCM_PROGS!$WCM_PROGS$ac_delim @@ -23511,26 +24066,23 @@ WCM_TCLLIBS!$WCM_TCLLIBS$ac_delim WCM_TCLPKGS!$WCM_TCLPKGS$ac_delim WCM_MODULES!$WCM_MODULES$ac_delim -WCM_XF86PROGS!$WCM_XF86PROGS$ac_delim WCM_XF86MODULES!$WCM_XF86MODULES$ac_delim -WCM_EXPPROGS!$WCM_EXPPROGS$ac_delim -WCM_EXPMODULES!$WCM_EXPMODULES$ac_delim WCM_ARCH!$WCM_ARCH$ac_delim WCM_KSTACK!$WCM_KSTACK$ac_delim WCM_MODVER!$WCM_MODVER$ac_delim -WCM_KERNELDIR!$WCM_KERNELDIR$ac_delim +WCM_KERNEL_DIR!$WCM_KERNEL_DIR$ac_delim WCM_KERNEL_VER!$WCM_KERNEL_VER$ac_delim -WCM_LINUXWACOMDIR!$WCM_LINUXWACOMDIR$ac_delim -WCM_XF86DIR!$WCM_XF86DIR$ac_delim -WCM_XORGSDK!$WCM_XORGSDK$ac_delim -WCM_XLIBDIR!$WCM_XLIBDIR$ac_delim +WCM_XFREE86_DIR!$WCM_XFREE86_DIR$ac_delim +WCM_XORGSDK_DIR!$WCM_XORGSDK_DIR$ac_delim WCM_MODDIR!$WCM_MODDIR$ac_delim WCM_XSERVER64!$WCM_XSERVER64$ac_delim WCM_NO_MERGE_CONSTANTS!$WCM_NO_MERGE_CONSTANTS$ac_delim -WCM_LINUX_INPUT!$WCM_LINUX_INPUT$ac_delim +WCM_NO_STACK_PROTECTOR!$WCM_NO_STACK_PROTECTOR$ac_delim +WCM_CLEVEL!$WCM_CLEVEL$ac_delim WCM_XIDUMP_LIBS!$WCM_XIDUMP_LIBS$ac_delim WCM_LIBWACOMCFG_LIBS!$WCM_LIBWACOMCFG_LIBS$ac_delim WCM_WACOMXI_LIBS!$WCM_WACOMXI_LIBS$ac_delim +WCM_PREFIX!$WCM_PREFIX$ac_delim WCM_XSETWACOM_LIBS!$WCM_XSETWACOM_LIBS$ac_delim WCM_DEPFLAGS!$WCM_DEPFLAGS$ac_delim WCM_OPTION_WACOM!$WCM_OPTION_WACOM$ac_delim @@ -23543,7 +24095,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -23770,6 +24322,11 @@ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -23823,6 +24380,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out @@ -23938,21 +24496,22 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -23987,8 +24546,9 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ @@ -24138,21 +24698,17 @@ echo "" echo "----------------------------------------" echo " BUILD ENVIRONMENT:" -echo " architecture - $WCM_ARCH" +echo " architecture - $WCM_ARCHITECTURE" echo " linux kernel - $WCM_ISLINUX $WCM_KERNEL_VER" echo " module versioning - $WCM_OPTION_MODVER $WCM_MODVER" -echo " kernel source - $WCM_ENV_KERNEL $WCM_KERNELDIR" -if test "$WCM_ENV_XF86" == "yes"; then -echo " X SOURCE - $WCM_ENV_XF86 $WCM_XF86DIR" -else -echo " Xorg SDK - $WCM_ENV_XORGSDK $WCM_XORGSDK" -fi +echo " kernel source - $WCM_ENV_KERNEL $WCM_KERNEL_DIR" +echo " XFree86 source - $WCM_ENV_XFREE86 $WCM_XFREE86_DIR" +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_XLIBDIR" -echo " TCL - $WCM_ENV_TCL $WCM_TCLDIR" -echo " TK - $WCM_ENV_TK $WCM_TKDIR" - +echo " XLib - $WCM_ENV_XLIB $WCM_XLIB_DIR" +echo " TCL - $WCM_ENV_TCL $WCM_TCL_DIR" +echo " TK - $WCM_ENV_TK $WCM_TK_DIR" echo " ncurses - $WCM_ENV_NCURSES" echo "" echo " BUILD OPTIONS:" @@ -24167,7 +24723,6 @@ echo " evdev.o - $WCM_OPTION_EVDEV" echo " mousedev.o - $WCM_OPTION_MOUSEDEV" echo " input.o - $WCM_OPTION_INPUT" -echo " tabletdev.o - $WCM_OPTION_TABLETDEV" if test "$WCM_OPTION_DLLOADER" == "yes" ; then echo " wacom_drv.so - $WCM_OPTION_WACOMDRV $WCM_MODDIR $WCM_PATCH_WACOMDRV" echo " wacom_drv.o - no" @@ -24175,12 +24730,13 @@ echo " wacom_drv.so - no" echo " wacom_drv.o - $WCM_OPTION_WACOMDRV $WCM_MODDIR $WCM_PATCH_WACOMDRV" fi +echo " wacom*_drv quirks -$WCM_XDRIVER_QUIRKS" echo "----------------------------------------" -kver=`echo $WCM_KERNEL_VER | grep -c "2.4"` -if test "$WCM_ARCH" = "x86_64" && test $kver != 0; then +if echo $WCM_KERNEL_VER | grep "2.4" >/dev/null && echo "$WCM_ARCHITECTURE" | grep "x86_64" >/dev/null; then echo "" - echo "***"; echo "*** Note:"; + echo "***" + echo "*** Note:" echo "*** For x86-64 kernel, we only support kernel 2.4.30 and kernel 2.6.* " echo "*** To compile Wacom related kernel 2.4.30 modules for x86-64, you need to " echo "*** copy the source files from src/2.4.30x86-64 to your kernel source tree " diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/ltmain.sh /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/ltmain.sh --- wacom-tools-0.7.9.3/linuxwacom/ltmain.sh 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/ltmain.sh 2008-03-29 02:02:53.000000000 -0400 @@ -2,7 +2,7 @@ # NOTE: Changing this file will not affect anything until you rerun configure. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007 Free Software Foundation, Inc. +# 2007, 2008 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="1.5.24 Debian 1.5.24-1" -TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" +VERSION="1.5.26 Debian 1.5.26-1ubuntu1" +TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -113,15 +113,21 @@ # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). # We save the old values to restore during execute mode. -for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +lt_env= +for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do eval "if test \"\${$lt_var+set}\" = set; then save_$lt_var=\$$lt_var + lt_env=\"$lt_var=\$$lt_var \$lt_env\" $lt_var=C export $lt_var fi" done +if test -n "$lt_env"; then + lt_env="env $lt_env" +fi + # Make sure IFS has a sensible default lt_nl=' ' @@ -485,7 +491,7 @@ echo "\ $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP -Copyright (C) 2007 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit $? @@ -788,6 +794,7 @@ *.for) xform=for ;; *.java) xform=java ;; *.obj) xform=obj ;; + *.sx) xform=sx ;; esac libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` @@ -956,7 +963,7 @@ $run $rm "$lobj" "$output_obj" $show "$command" - if $run eval "$command"; then : + if $run eval $lt_env "$command"; then : else test -n "$output_obj" && $run $rm $removelist exit $EXIT_FAILURE @@ -1028,7 +1035,7 @@ command="$command$suppress_output" $run $rm "$obj" "$output_obj" $show "$command" - if $run eval "$command"; then : + if $run eval $lt_env "$command"; then : else $run $rm $removelist exit $EXIT_FAILURE @@ -1161,6 +1168,7 @@ thread_safe=no vinfo= vinfo_number=no + single_module="${wl}-single_module" func_infer_tag $base_compile @@ -1646,6 +1654,11 @@ continue ;; + -multi_module) + single_module="${wl}-multi_module" + continue + ;; + -module) module=yes continue @@ -2152,7 +2165,12 @@ continue fi name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do + if test "$linkmode" = lib; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library lib="$searchdir/lib${name}${search_ext}" @@ -2948,12 +2966,18 @@ # we do not want to link against static libs, # but need to link against shared eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -n "$deplibrary_names" ; then for tmp in $deplibrary_names ; do depdepl=$tmp done - if test -f "$path/$depdepl" ; then + if test -f "$deplibdir/$depdepl" ; then + depdepl="$deplibdir/$depdepl" + elif test -f "$path/$depdepl" ; then depdepl="$path/$depdepl" + else + # Can't find it, oh well... + depdepl= fi # do not add paths which are already there case " $newlib_search_path " in @@ -3101,9 +3125,10 @@ case $linkmode in oldlib) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 - fi + case " $deplibs" in + *\ -l* | *\ -L*) + $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; + esac if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 @@ -4245,9 +4270,10 @@ ;; obj) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 - fi + case " $deplibs" in + *\ -l* | *\ -L*) + $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; + esac if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 @@ -6486,7 +6512,7 @@ fi # Restore saved environment variables - for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do eval "if test \"\${save_$lt_var+set}\" = set; then $lt_var=\$save_$lt_var; export $lt_var diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/Makefile.in 2008-03-29 02:02:53.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -35,10 +31,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/mkxincludes.in $(top_srcdir)/configure \ - $(top_srcdir)/src/2.6.10/Makefile.in \ + $(srcdir)/Makefile.in $(srcdir)/mkxincludes.in \ + $(top_srcdir)/configure $(top_srcdir)/src/2.6.10/Makefile.in \ $(top_srcdir)/src/2.6.11/Makefile.in \ $(top_srcdir)/src/2.6.13/Makefile.in \ $(top_srcdir)/src/2.6.14/Makefile.in \ @@ -47,31 +43,40 @@ $(top_srcdir)/src/2.6.18/Makefile.in \ $(top_srcdir)/src/2.6.19/Makefile.in \ $(top_srcdir)/src/2.6.22/Makefile.in \ + $(top_srcdir)/src/2.6.24/Makefile.in \ $(top_srcdir)/src/2.6.8/Makefile.in \ - $(top_srcdir)/src/2.6.9/Makefile.in AUTHORS ChangeLog NEWS \ - config.guess config.sub depcomp install-sh ltmain.sh missing -subdir = . + $(top_srcdir)/src/2.6.9/Makefile.in \ + $(top_srcdir)/src/include/kernel-config.h.in \ + $(top_srcdir)/src/include/util-config.h.in \ + $(top_srcdir)/src/include/xdrv-config.h.in AUTHORS ChangeLog \ + NEWS config.guess config.sub depcomp install-sh ltmain.sh \ + missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = config.h +CONFIG_HEADER = $(top_builddir)/src/include/xdrv-config.h \ + $(top_builddir)/src/include/kernel-config.h \ + $(top_builddir)/src/include/util-config.h CONFIG_CLEAN_FILES = mkxincludes src/2.6.8/Makefile src/2.6.9/Makefile \ src/2.6.10/Makefile src/2.6.11/Makefile src/2.6.13/Makefile \ src/2.6.14/Makefile src/2.6.15/Makefile src/2.6.16/Makefile \ - src/2.6.18/Makefile src/2.6.19/Makefile src/2.6.22/Makefile + src/2.6.18/Makefile src/2.6.19/Makefile src/2.6.22/Makefile \ + src/2.6.24/Makefile SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -87,8 +92,6 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -107,6 +110,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -116,6 +120,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -127,9 +132,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -146,51 +151,35 @@ STRIP = @STRIP@ TCLSH = @TCLSH@ VERSION = @VERSION@ -WACOMXI_INSTALL_FALSE = @WACOMXI_INSTALL_FALSE@ -WACOMXI_INSTALL_TRUE = @WACOMXI_INSTALL_TRUE@ WCM_ARCH = @WCM_ARCH@ -WCM_CFLAGS_STACK_PROTECTOR = @WCM_CFLAGS_STACK_PROTECTOR@ +WCM_CLEVEL = @WCM_CLEVEL@ WCM_DEPFLAGS = @WCM_DEPFLAGS@ -WCM_DLLOADER_FALSE = @WCM_DLLOADER_FALSE@ -WCM_DLLOADER_TRUE = @WCM_DLLOADER_TRUE@ -WCM_ENV_NCURSES_FALSE = @WCM_ENV_NCURSES_FALSE@ -WCM_ENV_NCURSES_TRUE = @WCM_ENV_NCURSES_TRUE@ -WCM_ENV_XF86_FALSE = @WCM_ENV_XF86_FALSE@ -WCM_ENV_XF86_TRUE = @WCM_ENV_XF86_TRUE@ -WCM_ENV_XORGSDK_FALSE = @WCM_ENV_XORGSDK_FALSE@ -WCM_ENV_XORGSDK_TRUE = @WCM_ENV_XORGSDK_TRUE@ -WCM_EXPMODULES = @WCM_EXPMODULES@ -WCM_EXPPROGS = @WCM_EXPPROGS@ -WCM_KERNELDIR = @WCM_KERNELDIR@ +WCM_KERNEL_DIR = @WCM_KERNEL_DIR@ WCM_KERNEL_VER = @WCM_KERNEL_VER@ WCM_KSTACK = @WCM_KSTACK@ WCM_LIBS = @WCM_LIBS@ WCM_LIBWACOMCFG_LIBS = @WCM_LIBWACOMCFG_LIBS@ WCM_LIBWACOMCFG_VER = @WCM_LIBWACOMCFG_VER@ -WCM_LINUXWACOMDIR = @WCM_LINUXWACOMDIR@ -WCM_LINUX_INPUT = @WCM_LINUX_INPUT@ WCM_MODDIR = @WCM_MODDIR@ WCM_MODULES = @WCM_MODULES@ WCM_MODVER = @WCM_MODVER@ WCM_NO_MERGE_CONSTANTS = @WCM_NO_MERGE_CONSTANTS@ +WCM_NO_STACK_PROTECTOR = @WCM_NO_STACK_PROTECTOR@ WCM_OPTION_EVDEV = @WCM_OPTION_EVDEV@ WCM_OPTION_HID = @WCM_OPTION_HID@ WCM_OPTION_INPUT = @WCM_OPTION_INPUT@ WCM_OPTION_MOUSEDEV = @WCM_OPTION_MOUSEDEV@ WCM_OPTION_USBMOUSE = @WCM_OPTION_USBMOUSE@ WCM_OPTION_WACOM = @WCM_OPTION_WACOM@ +WCM_PREFIX = @WCM_PREFIX@ WCM_PROGS = @WCM_PROGS@ WCM_TCLLIBS = @WCM_TCLLIBS@ WCM_TCLPKGS = @WCM_TCLPKGS@ -WCM_WACOMXI_BINDIR = @WCM_WACOMXI_BINDIR@ -WCM_WACOMXI_LIBDIR = @WCM_WACOMXI_LIBDIR@ WCM_WACOMXI_LIBS = @WCM_WACOMXI_LIBS@ -WCM_XF86DIR = @WCM_XF86DIR@ WCM_XF86MODULES = @WCM_XF86MODULES@ -WCM_XF86PROGS = @WCM_XF86PROGS@ +WCM_XFREE86_DIR = @WCM_XFREE86_DIR@ WCM_XIDUMP_LIBS = @WCM_XIDUMP_LIBS@ -WCM_XLIBDIR = @WCM_XLIBDIR@ -WCM_XORGSDK = @WCM_XORGSDK@ +WCM_XORGSDK_DIR = @WCM_XORGSDK_DIR@ WCM_XSERVER64 = @WCM_XSERVER64@ WCM_XSETWACOM_LIBS = @WCM_XSETWACOM_LIBS@ XMKMF = @XMKMF@ @@ -200,13 +189,15 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ +Xlib_CFLAGS = @Xlib_CFLAGS@ +Xlib_LIBS = @Xlib_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -218,6 +209,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -245,15 +237,17 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = src noinst_SCRIPT = wrapitup EXTRA_DIST = docs/docs.html GPL prebuilt/wacom_drv.o \ docs/docs_files/null.gif docs/docs_files/sflogo.png -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive +all: all-recursive .SUFFIXES: am--refresh: @@ -290,22 +284,42 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -config.h: stamp-h1 +src/include/xdrv-config.h: src/include/stamp-h1 @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + rm -f src/include/stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) src/include/stamp-h1; \ else :; fi -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +src/include/stamp-h1: $(top_srcdir)/src/include/xdrv-config.h.in $(top_builddir)/config.status + @rm -f src/include/stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status src/include/xdrv-config.h +$(top_srcdir)/src/include/xdrv-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h1 + rm -f src/include/stamp-h1 touch $@ +src/include/kernel-config.h: src/include/stamp-h2 + @if test ! -f $@; then \ + rm -f src/include/stamp-h2; \ + $(MAKE) $(AM_MAKEFLAGS) src/include/stamp-h2; \ + else :; fi + +src/include/stamp-h2: $(top_srcdir)/src/include/kernel-config.h.in $(top_builddir)/config.status + @rm -f src/include/stamp-h2 + cd $(top_builddir) && $(SHELL) ./config.status src/include/kernel-config.h + +src/include/util-config.h: src/include/stamp-h3 + @if test ! -f $@; then \ + rm -f src/include/stamp-h3; \ + $(MAKE) $(AM_MAKEFLAGS) src/include/stamp-h3; \ + else :; fi + +src/include/stamp-h3: $(top_srcdir)/src/include/util-config.h.in $(top_builddir)/config.status + @rm -f src/include/stamp-h3 + cd $(top_builddir) && $(SHELL) ./config.status src/include/util-config.h + distclean-hdr: - -rm -f config.h stamp-h1 + -rm -f src/include/xdrv-config.h src/include/stamp-h1 src/include/kernel-config.h src/include/stamp-h2 src/include/util-config.h src/include/stamp-h3 mkxincludes: $(top_builddir)/config.status $(srcdir)/mkxincludes.in cd $(top_builddir) && $(SHELL) ./config.status $@ src/2.6.8/Makefile: $(top_builddir)/config.status $(top_srcdir)/src/2.6.8/Makefile.in @@ -330,6 +344,8 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ src/2.6.22/Makefile: $(top_builddir)/config.status $(top_srcdir)/src/2.6.22/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ +src/2.6.24/Makefile: $(top_builddir)/config.status $(top_srcdir)/src/2.6.24/Makefile.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -339,7 +355,6 @@ distclean-libtool: -rm -f libtool -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -372,8 +387,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -417,12 +431,12 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ @@ -439,28 +453,27 @@ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -475,24 +488,22 @@ distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/docs $(distdir)/docs/docs_files $(distdir)/prebuilt $(distdir)/src/2.6.10 $(distdir)/src/2.6.11 $(distdir)/src/2.6.13 $(distdir)/src/2.6.14 $(distdir)/src/2.6.15 $(distdir)/src/2.6.16 $(distdir)/src/2.6.18 $(distdir)/src/2.6.19 $(distdir)/src/2.6.22 $(distdir)/src/2.6.8 $(distdir)/src/2.6.9 $(distdir)/src/wacomxi - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -506,7 +517,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -514,6 +525,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -521,7 +534,7 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -531,6 +544,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -557,6 +574,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -596,7 +615,7 @@ $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -617,7 +636,7 @@ exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile config.h +all-am: Makefile installdirs: installdirs-recursive installdirs-am: install: install-recursive @@ -666,12 +685,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -692,24 +719,26 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am x-includes: diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/mkxincludes.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/mkxincludes.in --- wacom-tools-0.7.9.3/linuxwacom/mkxincludes.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/mkxincludes.in 2008-02-29 18:58:44.000000000 -0500 @@ -12,7 +12,7 @@ # of it. # -XF86_DIR=@WCM_XF86DIR@/xc +XF86_DIR=@WCM_XFREE86_DIR@/xc XF86MODS="@WCM_XF86MODULES@" DEPFLAGS=@WCM_DEPFLAGS@ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.4/hid-core.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.4/hid-core.c --- wacom-tools-0.7.9.3/linuxwacom/src/2.4/hid-core.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.4/hid-core.c 2008-02-29 18:58:44.000000000 -0500 @@ -27,7 +27,7 @@ * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic */ -#include "../../config.h" +#include "../include/kernel-config.h" /* * WARNING: THIS IS NOT PART OF THE OFFICIAL KERNEL TREE @@ -85,6 +85,14 @@ static char *hid_types[] = {"Device", "Pointer", "Mouse", "Device", "Joystick", "Gamepad", "Keyboard", "Keypad", "Multi-Axis Controller"}; +/* Need these two later, needs to be defined for older kernels */ +#ifndef HID_QUIRK_IGNORE +#define HID_QUIRK_IGNORE 0x04 +#endif +#ifndef HID_QUIRK_NOGET +#define HID_QUIRK_NOGET 0x08 +#endif + /* * Register a new report for a device. */ @@ -1117,14 +1125,6 @@ #define USB_DEVICE_ID_ATEN_2PORTKVM 0x2204 #define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205 -/* JEJ - added for 2.4.18 compatibility */ -#if WCM_PATCH_NOQUIRK -#define HID_QUIRK_INVERT 0x01 -#define HID_QUIRK_NOTOUCH 0x02 -#define HID_QUIRK_IGNORE 0x04 -#define HID_QUIRK_NOGET 0x08 -#endif - struct hid_blacklist { __u16 idVendor; __u16 idProduct; diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.4/Makefile.am /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.4/Makefile.am --- wacom-tools-0.7.9.3/linuxwacom/src/2.4/Makefile.am 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.4/Makefile.am 2008-02-29 18:58:44.000000000 -0500 @@ -2,25 +2,20 @@ EXTRA_SCRIPTS = wacom.o hid.o usbmouse.o evdev.o input.o mousedev.o -KERNEL_DIR=@WCM_KERNELDIR@ DEBUG_FLAGS = -D__JEJ_DEBUG -MODS = @WCM_MODVER@ -ARCHITECTURE=@WCM_ARCH@ -USBDIR=$(KERNEL_DIR)/drivers/usb -KSTACK=@WCM_KSTACK@ +USBDIR=$(WCM_KERNEL_DIR)/drivers/usb KCFLAGS = -Wall $(DEBUG_FLAGS) -D__KERNEL__ \ - -DMODULE -DEXPORT_SYMTAB $(MODS) \ + -DMODULE -DEXPORT_SYMTAB $(WCM_MODVER) \ -Wstrict-prototypes -Wno-trigraphs -O2 \ -fno-strict-aliasing \ -fno-common -fomit-frame-pointer -pipe \ - $(KSTACK) -march=$(ARCHITECTURE) + $(WCM_KSTACK) -march=$(WCM_ARCH) NO_MERGE_CONSTANTS=@WCM_NO_MERGE_CONSTANTS@ -LINUX_INPUT=@WCM_LINUX_INPUT@ -I$(KERNEL_DIR)/include wacom.o: wacom.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=wacom -c -o wacom.o wacom.c HID_OBJS = hid-core.o hiddev.o hid-input.o @@ -29,34 +24,34 @@ $(LD) -r -o $@ $(HID_OBJS) hid-core.o: hid-core.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=hid-core -c -o hid-core.o hid-core.c hiddev.o: $(USBDIR)/hiddev.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=hiddev -c -o hiddev.o hiddev.c hid-input.o: $(USBDIR)/hid-input.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=hid-input -c \ -o hid-input.o hid-input.c usbmouse.o: usbmouse.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=usbmouse -c \ -o usbmouse.o usbmouse.c evdev.o: evdev.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=evdev -c -o evdev.o evdev.c mousedev.o: mousedev.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=mousedev -c -o mousedev.o mousedev.c input.o: input.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=input -c -o input.o input.c clean: - rm -f *.o core *.core \ No newline at end of file + rm -f *.o core *.core diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.4/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.4/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.4/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.4/Makefile.in 2008-03-29 02:02:53.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -39,8 +35,7 @@ subdir = src/2.4 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -51,8 +46,6 @@ DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -71,6 +64,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -80,6 +74,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -91,9 +86,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -108,21 +103,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TCLSH = @TCLSH@ VERSION = @VERSION@ -WACOMXI_INSTALL_FALSE = @WACOMXI_INSTALL_FALSE@ -WACOMXI_INSTALL_TRUE = @WACOMXI_INSTALL_TRUE@ WCM_ARCH = @WCM_ARCH@ WCM_CFLAGS_STACK_PROTECTOR = @WCM_CFLAGS_STACK_PROTECTOR@ WCM_DEPFLAGS = @WCM_DEPFLAGS@ -WCM_DLLOADER_FALSE = @WCM_DLLOADER_FALSE@ -WCM_DLLOADER_TRUE = @WCM_DLLOADER_TRUE@ -WCM_ENV_NCURSES_FALSE = @WCM_ENV_NCURSES_FALSE@ -WCM_ENV_NCURSES_TRUE = @WCM_ENV_NCURSES_TRUE@ -WCM_ENV_XF86_FALSE = @WCM_ENV_XF86_FALSE@ -WCM_ENV_XF86_TRUE = @WCM_ENV_XF86_TRUE@ -WCM_ENV_XORGSDK_FALSE = @WCM_ENV_XORGSDK_FALSE@ -WCM_ENV_XORGSDK_TRUE = @WCM_ENV_XORGSDK_TRUE@ WCM_EXPMODULES = @WCM_EXPMODULES@ WCM_EXPPROGS = @WCM_EXPPROGS@ WCM_KERNELDIR = @WCM_KERNELDIR@ @@ -164,13 +148,13 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -182,6 +166,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -209,25 +194,23 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ noinst_SCRIPTS = @WCM_MODULES@ EXTRA_SCRIPTS = wacom.o hid.o usbmouse.o evdev.o input.o mousedev.o -KERNEL_DIR = @WCM_KERNELDIR@ DEBUG_FLAGS = -D__JEJ_DEBUG -MODS = @WCM_MODVER@ -ARCHITECTURE = @WCM_ARCH@ -USBDIR = $(KERNEL_DIR)/drivers/usb -KSTACK = @WCM_KSTACK@ +USBDIR = $(WCM_KERNEL_DIR)/drivers/usb KCFLAGS = -Wall $(DEBUG_FLAGS) -D__KERNEL__ \ - -DMODULE -DEXPORT_SYMTAB $(MODS) \ + -DMODULE -DEXPORT_SYMTAB $(WCM_MODVER) \ -Wstrict-prototypes -Wno-trigraphs -O2 \ -fno-strict-aliasing \ -fno-common -fomit-frame-pointer -pipe \ - $(KSTACK) -march=$(ARCHITECTURE) + $(WCM_KSTACK) -march=$(WCM_ARCH) NO_MERGE_CONSTANTS = @WCM_NO_MERGE_CONSTANTS@ -LINUX_INPUT = @WCM_LINUX_INPUT@ -I$(KERNEL_DIR)/include HID_OBJS = hid-core.o hiddev.o hid-input.o all: all-am @@ -267,10 +250,6 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -279,22 +258,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -337,7 +315,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -351,12 +329,20 @@ install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -375,54 +361,57 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am wacom.o: wacom.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=wacom -c -o wacom.o wacom.c hid.o: $(HID_OBJS) Makefile $(LD) -r -o $@ $(HID_OBJS) hid-core.o: hid-core.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=hid-core -c -o hid-core.o hid-core.c hiddev.o: $(USBDIR)/hiddev.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=hiddev -c -o hiddev.o hiddev.c hid-input.o: $(USBDIR)/hid-input.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=hid-input -c \ -o hid-input.o hid-input.c usbmouse.o: usbmouse.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=usbmouse -c \ -o usbmouse.o usbmouse.c evdev.o: evdev.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=evdev -c -o evdev.o evdev.c mousedev.o: mousedev.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=mousedev -c -o mousedev.o mousedev.c input.o: input.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=input -c -o input.o input.c clean: diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.4/wacom.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.4/wacom.c --- wacom-tools-0.7.9.3/linuxwacom/src/2.4/wacom.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.4/wacom.c 2008-02-29 18:58:44.000000000 -0500 @@ -7,7 +7,7 @@ * Copyright (c) 2000 Daniel Egger * Copyright (c) 2001 Frederic Lepied * Copyright (c) 2002 Christer Nilsson - * Copyright (c) 2002-2007 Ping Cheng + * Copyright (c) 2002-2008 Ping Cheng * Copyright (c) 2002 John Joganic * * USB Wacom Graphire and Intuos tablet support @@ -91,6 +91,7 @@ * v1.30-j0.7.8 - Added Bamboo * v1.30-j0.7.9 - added Bamboo1, Bamboo Fun, and Hummingbird * v1.30-j0.7.9-3 - Sync with wcmUSB.c + * v1.30-j0.7.9-8 - Added Cintiq 20WSX */ /* @@ -121,7 +122,7 @@ /* * Version Information */ -#define DRIVER_VERSION "v1.30-j0.7.9-3" +#define DRIVER_VERSION "v1.30-j0.7.9-8" #define DRIVER_AUTHOR "Vojtech Pavlik " #ifndef __JEJ_DEBUG #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver (LINUXWACOM)" @@ -931,14 +932,17 @@ /* 44 */ { "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, wacom_intuos_irq, WACOM_INTUOS_BITS, WACOM_INTUOS3_ABS, 0, WACOM_INTUOS3_BUTTONS, WACOM_INTUOS3_TOOLS }, - /* 45 */ { "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, + /* 45 */ { "Wacom Cintiq 20WSX", 10, 86680, 54180, 1023, 63, wacom_intuos_irq, WACOM_INTUOS_BITS, WACOM_INTUOS3_ABS, 0, WACOM_BEE_BUTTONS, WACOM_INTUOS3_TOOLS }, - /* 46 */ { "Wacom DTF720", 8, 6858, 5506, 511, 0, + /* 46 */ { "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, + wacom_intuos_irq, WACOM_INTUOS_BITS, WACOM_INTUOS3_ABS, + 0, WACOM_BEE_BUTTONS, WACOM_INTUOS3_TOOLS }, + /* 47 */ { "Wacom DTF720", 8, 6858, 5506, 511, 0, wacom_pl_irq, 0, 0, 0, 0 }, - /* 47 */ { "Wacom DTF521", 8, 6282, 4762, 511, 0, + /* 48 */ { "Wacom DTF521", 8, 6282, 4762, 511, 0, wacom_pl_irq, 0, 0, 0, 0 }, - /* 48 */ { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, + /* 49 */ { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, wacom_intuos_irq, WACOM_INTUOS_BITS, WACOM_INTUOS_ABS, WACOM_INTUOS_REL, WACOM_INTUOS_BUTTONS, WACOM_INTUOS_TOOLS }, { NULL , 0 } @@ -990,9 +994,10 @@ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5), driver_info: 42 }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7), driver_info: 43 }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F), driver_info: 44 }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6), driver_info: 45 }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC0), driver_info: 46 }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC4), driver_info: 47 }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5), driver_info: 45 }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6), driver_info: 46 }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC0), driver_info: 47 }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC4), driver_info: 48 }, /* some Intuos2 6x8's erroneously report as 0x47; * multiple confirmed examples exist. */ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.4.22/Makefile.am /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.4.22/Makefile.am --- wacom-tools-0.7.9.3/linuxwacom/src/2.4.22/Makefile.am 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.4.22/Makefile.am 2008-02-29 18:58:44.000000000 -0500 @@ -2,25 +2,20 @@ EXTRA_SCRIPTS = wacom.o hid.o usbmouse.o evdev.o input.o mousedev.o -KERNEL_DIR=@WCM_KERNELDIR@ DEBUG_FLAGS = -D__JEJ_DEBUG -MODS = @WCM_MODVER@ -ARCHITECTURE=@WCM_ARCH@ -USBDIR=$(KERNEL_DIR)/drivers/usb -KSTACK=@WCM_KSTACK@ +USBDIR=$(WCM_KERNEL_DIR)/drivers/usb KCFLAGS = -Wall $(DEBUG_FLAGS) -D__KERNEL__ \ - -DMODULE -DEXPORT_SYMTAB $(MODS) \ + -DMODULE -DEXPORT_SYMTAB $(WCM_MODVER) \ -Wstrict-prototypes -Wno-trigraphs -O2 \ -fno-strict-aliasing \ -fno-common -fomit-frame-pointer -pipe \ - $(KSTACK) -march=$(ARCHITECTURE) + $(WCM_KSTACK) -march=$(WCM_ARCH) NO_MERGE_CONSTANTS=@WCM_NO_MERGE_CONSTANTS@ -LINUX_INPUT=@WCM_LINUX_INPUT@ -I$(KERNEL_DIR)/include wacom.o: wacom.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=wacom -c -o wacom.o wacom.c HID_OBJS = hid-core.o hiddev.o hid-input.o @@ -29,34 +24,34 @@ $(LD) -r -o $@ $(HID_OBJS) hid-core.o: hid-core.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=hid-core -c -o hid-core.o hid-core.c hiddev.o: $(USBDIR)/hiddev.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=hiddev -c -o hiddev.o hiddev.c hid-input.o: $(USBDIR)/hid-input.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=hid-input -c \ -o hid-input.o hid-input.c usbmouse.o: usbmouse.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=usbmouse -c \ -o usbmouse.o usbmouse.c evdev.o: evdev.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=evdev -c -o evdev.o evdev.c mousedev.o: mousedev.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=mousedev -c -o mousedev.o mousedev.c input.o: input.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=input -c -o input.o input.c clean: - rm -f *.o core *.core \ No newline at end of file + rm -f *.o core *.core diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.4.22/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.4.22/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.4.22/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.4.22/Makefile.in 2008-03-29 02:02:53.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -39,8 +35,7 @@ subdir = src/2.4.22 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -51,8 +46,6 @@ DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -71,6 +64,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -80,6 +74,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -91,9 +86,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -108,21 +103,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TCLSH = @TCLSH@ VERSION = @VERSION@ -WACOMXI_INSTALL_FALSE = @WACOMXI_INSTALL_FALSE@ -WACOMXI_INSTALL_TRUE = @WACOMXI_INSTALL_TRUE@ WCM_ARCH = @WCM_ARCH@ WCM_CFLAGS_STACK_PROTECTOR = @WCM_CFLAGS_STACK_PROTECTOR@ WCM_DEPFLAGS = @WCM_DEPFLAGS@ -WCM_DLLOADER_FALSE = @WCM_DLLOADER_FALSE@ -WCM_DLLOADER_TRUE = @WCM_DLLOADER_TRUE@ -WCM_ENV_NCURSES_FALSE = @WCM_ENV_NCURSES_FALSE@ -WCM_ENV_NCURSES_TRUE = @WCM_ENV_NCURSES_TRUE@ -WCM_ENV_XF86_FALSE = @WCM_ENV_XF86_FALSE@ -WCM_ENV_XF86_TRUE = @WCM_ENV_XF86_TRUE@ -WCM_ENV_XORGSDK_FALSE = @WCM_ENV_XORGSDK_FALSE@ -WCM_ENV_XORGSDK_TRUE = @WCM_ENV_XORGSDK_TRUE@ WCM_EXPMODULES = @WCM_EXPMODULES@ WCM_EXPPROGS = @WCM_EXPPROGS@ WCM_KERNELDIR = @WCM_KERNELDIR@ @@ -164,13 +148,13 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -182,6 +166,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -209,25 +194,23 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ noinst_SCRIPTS = @WCM_MODULES@ EXTRA_SCRIPTS = wacom.o hid.o usbmouse.o evdev.o input.o mousedev.o -KERNEL_DIR = @WCM_KERNELDIR@ DEBUG_FLAGS = -D__JEJ_DEBUG -MODS = @WCM_MODVER@ -ARCHITECTURE = @WCM_ARCH@ -USBDIR = $(KERNEL_DIR)/drivers/usb -KSTACK = @WCM_KSTACK@ +USBDIR = $(WCM_KERNEL_DIR)/drivers/usb KCFLAGS = -Wall $(DEBUG_FLAGS) -D__KERNEL__ \ - -DMODULE -DEXPORT_SYMTAB $(MODS) \ + -DMODULE -DEXPORT_SYMTAB $(WCM_MODVER) \ -Wstrict-prototypes -Wno-trigraphs -O2 \ -fno-strict-aliasing \ -fno-common -fomit-frame-pointer -pipe \ - $(KSTACK) -march=$(ARCHITECTURE) + $(WCM_KSTACK) -march=$(WCM_ARCH) NO_MERGE_CONSTANTS = @WCM_NO_MERGE_CONSTANTS@ -LINUX_INPUT = @WCM_LINUX_INPUT@ -I$(KERNEL_DIR)/include HID_OBJS = hid-core.o hiddev.o hid-input.o all: all-am @@ -267,10 +250,6 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -279,22 +258,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -337,7 +315,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -351,12 +329,20 @@ install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -375,54 +361,57 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am wacom.o: wacom.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=wacom -c -o wacom.o wacom.c hid.o: $(HID_OBJS) Makefile $(LD) -r -o $@ $(HID_OBJS) hid-core.o: hid-core.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=hid-core -c -o hid-core.o hid-core.c hiddev.o: $(USBDIR)/hiddev.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=hiddev -c -o hiddev.o hiddev.c hid-input.o: $(USBDIR)/hid-input.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=hid-input -c \ -o hid-input.o hid-input.c usbmouse.o: usbmouse.c Makefile - $(CC) -I$(KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include -I$(USBDIR) $(KCFLAGS) \ -DKBUILD_BASENAME=usbmouse -c \ -o usbmouse.o usbmouse.c evdev.o: evdev.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=evdev -c -o evdev.o evdev.c mousedev.o: mousedev.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=mousedev -c -o mousedev.o mousedev.c input.o: input.c Makefile - $(CC) -I$(KERNEL_DIR)/include $(KCFLAGS) \ + $(CC) -I$(WCM_KERNEL_DIR)/include $(KCFLAGS) \ -DKBUILD_BASENAME=input -c -o input.o input.c clean: diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.4.22/wacom.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.4.22/wacom.c --- wacom-tools-0.7.9.3/linuxwacom/src/2.4.22/wacom.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.4.22/wacom.c 2008-02-29 18:58:44.000000000 -0500 @@ -7,7 +7,7 @@ * Copyright (c) 2000 Daniel Egger * Copyright (c) 2001 Frederic Lepied * Copyright (c) 2002 Christer Nilsson - * Copyright (c) 2002-2007 Ping Cheng + * Copyright (c) 2002-2008 Ping Cheng * Copyright (c) 2002 John Joganic * * USB Wacom Graphire and Intuos tablet support @@ -90,6 +90,7 @@ * v1.30-j0.7.7 - Support Intuos outbound tracking * v1.30-j0.7.8 - Added Bamboo * v1.30-j0.7.9 - added Bamboo1, Bamboo Fun, and Hummingbird + * v1.30-j0.7.9-8 - Added Cintiq 20WSX */ /* @@ -120,7 +121,7 @@ /* * Version Information */ -#define DRIVER_VERSION "v1.30-j0.7.9" +#define DRIVER_VERSION "v1.30-j0.7.9-8" #define DRIVER_AUTHOR "Vojtech Pavlik " #ifndef __JEJ_DEBUG #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver (LINUXWACOM)" @@ -931,14 +932,17 @@ /* 44 */ { "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, wacom_intuos_irq, WACOM_INTUOS_BITS, WACOM_INTUOS3_ABS, 0, WACOM_INTUOS3_BUTTONS, WACOM_INTUOS3_TOOLS }, - /* 45 */ { "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, + /* 45 */ { "Wacom Cintiq 20WSX", 10, 86680, 54180, 1023, 63, wacom_intuos_irq, WACOM_INTUOS_BITS, WACOM_INTUOS3_ABS, 0, WACOM_BEE_BUTTONS, WACOM_INTUOS3_TOOLS }, - /* 46 */ { "Wacom DTF720", 8, 6858, 5506, 511, 0, + /* 46 */ { "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, + wacom_intuos_irq, WACOM_INTUOS_BITS, WACOM_INTUOS3_ABS, + 0, WACOM_BEE_BUTTONS, WACOM_INTUOS3_TOOLS }, + /* 47 */ { "Wacom DTF720", 8, 6858, 5506, 511, 0, wacom_pl_irq, 0, 0, 0, 0 }, - /* 47 */ { "Wacom DTF521", 8, 6282, 4762, 511, 0, + /* 48 */ { "Wacom DTF521", 8, 6282, 4762, 511, 0, wacom_pl_irq, 0, 0, 0, 0 }, - /* 48 */ { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, + /* 49 */ { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, wacom_intuos_irq, WACOM_INTUOS_BITS, WACOM_INTUOS_ABS, WACOM_INTUOS_REL, WACOM_INTUOS_BUTTONS, WACOM_INTUOS_TOOLS }, { NULL , 0 } @@ -990,9 +994,10 @@ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5), driver_info: 42 }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7), driver_info: 43 }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F), driver_info: 44 }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6), driver_info: 45 }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC0), driver_info: 46 }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC4), driver_info: 47 }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5), driver_info: 45 }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6), driver_info: 46 }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC0), driver_info: 47 }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC4), driver_info: 48 }, /* some Intuos2 6x8's erroneously report as 0x47; * multiple confirmed examples exist. */ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.4.28/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.4.28/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.4.28/Makefile.in 2008-03-29 02:02:53.000000000 -0400 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.4.28/Makefile.in 2008-03-29 02:02:53.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -39,8 +35,7 @@ subdir = src/2.4.28 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -51,8 +46,6 @@ DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -71,6 +64,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -80,6 +74,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -91,9 +86,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -102,25 +97,16 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TCLSH = @TCLSH@ VERSION = @VERSION@ -WACOMXI_INSTALL_FALSE = @WACOMXI_INSTALL_FALSE@ -WACOMXI_INSTALL_TRUE = @WACOMXI_INSTALL_TRUE@ WCM_ARCH = @WCM_ARCH@ WCM_CFLAGS_STACK_PROTECTOR = @WCM_CFLAGS_STACK_PROTECTOR@ WCM_DEPFLAGS = @WCM_DEPFLAGS@ -WCM_DLLOADER_FALSE = @WCM_DLLOADER_FALSE@ -WCM_DLLOADER_TRUE = @WCM_DLLOADER_TRUE@ -WCM_ENV_NCURSES_FALSE = @WCM_ENV_NCURSES_FALSE@ -WCM_ENV_NCURSES_TRUE = @WCM_ENV_NCURSES_TRUE@ -WCM_ENV_XF86_FALSE = @WCM_ENV_XF86_FALSE@ -WCM_ENV_XF86_TRUE = @WCM_ENV_XF86_TRUE@ -WCM_ENV_XORGSDK_FALSE = @WCM_ENV_XORGSDK_FALSE@ -WCM_ENV_XORGSDK_TRUE = @WCM_ENV_XORGSDK_TRUE@ WCM_EXPMODULES = @WCM_EXPMODULES@ WCM_EXPPROGS = @WCM_EXPPROGS@ WCM_KERNELDIR = @WCM_KERNELDIR@ @@ -156,17 +142,19 @@ WCM_XSERVER64 = @WCM_XSERVER64@ WCM_XSETWACOM_LIBS = @WCM_XSETWACOM_LIBS@ XMKMF = @XMKMF@ +XSERVER_CFLAGS = @XSERVER_CFLAGS@ +XSERVER_LIBS = @XSERVER_LIBS@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -178,6 +166,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -205,8 +194,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ noinst_SCRIPTS = @WCM_MODULES@ EXTRA_SCRIPTS = wacom.o hid.o usbmouse.o evdev.o input.o mousedev.o KERNEL_DIR = @WCM_KERNELDIR@ @@ -263,10 +255,6 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -275,22 +263,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -333,7 +320,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -347,12 +334,20 @@ install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -371,17 +366,20 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am wacom.o: wacom.c Makefile diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.4.30x86-64/wacom.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.4.30x86-64/wacom.c --- wacom-tools-0.7.9.3/linuxwacom/src/2.4.30x86-64/wacom.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.4.30x86-64/wacom.c 2008-02-29 18:58:44.000000000 -0500 @@ -7,7 +7,7 @@ * Copyright (c) 2000 Daniel Egger * Copyright (c) 2001 Frederic Lepied * Copyright (c) 2002 Christer Nilsson - * Copyright (c) 2002-2007 Ping Cheng + * Copyright (c) 2002-2008 Ping Cheng * Copyright (c) 2002 John Joganic * * USB Wacom Graphire and Intuos tablet support @@ -59,6 +59,7 @@ * v2.4.30-pc0.7.7 - Support Intuos outbound tracking * v2.4.30-pc0.7.8 - Added Bamboo * v2.4.30-pc0.7.9 - Added Bamboo1, Bamboo Fun, and Hummingbird + * v2.4.30-pc0.7.9-8 - Added Cintiq 20WSX */ /* @@ -89,7 +90,7 @@ /* * Version Information */ -#define DRIVER_VERSION "v2.4.30-pc0.7.9" +#define DRIVER_VERSION "v2.4.30-pc0.7.9-8" #define DRIVER_AUTHOR "Vojtech Pavlik " #ifndef __JEJ_DEBUG #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver (LINUXWACOM)" @@ -873,14 +874,17 @@ /* 44 */ { "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, wacom_intuos_irq, WACOM_INTUOS_BITS, WACOM_INTUOS3_ABS, 0, WACOM_INTUOS3_BUTTONS, WACOM_INTUOS3_TOOLS }, - /* 45 */ { "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, + /* 45 */ { "Wacom Cintiq 20WSX", 10, 86680, 54180, 1023, 63, wacom_intuos_irq, WACOM_INTUOS_BITS, WACOM_INTUOS3_ABS, 0, WACOM_BEE_BUTTONS, WACOM_INTUOS3_TOOLS }, - /* 46 */ { "Wacom DTF720", 8, 6858, 5506, 511, 0, + /* 46 */ { "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, + wacom_intuos_irq, WACOM_INTUOS_BITS, WACOM_INTUOS3_ABS, + 0, WACOM_BEE_BUTTONS, WACOM_INTUOS3_TOOLS }, + /* 47 */ { "Wacom DTF720", 8, 6858, 5506, 511, 0, wacom_pl_irq, 0, 0, 0, 0 }, - /* 47 */ { "Wacom DTF521", 8, 6282, 4762, 511, 0, + /* 48 */ { "Wacom DTF521", 8, 6282, 4762, 511, 0, wacom_pl_irq, 0, 0, 0, 0 }, - /* 48 */ { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, + /* 49 */ { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, wacom_intuos_irq, WACOM_INTUOS_BITS, WACOM_INTUOS_ABS, WACOM_INTUOS_REL, WACOM_INTUOS_BUTTONS, WACOM_INTUOS_TOOLS }, { NULL , 0 } @@ -932,9 +936,10 @@ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5), driver_info: 42 }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7), driver_info: 43 }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F), driver_info: 44 }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6), driver_info: 45 }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC0), driver_info: 46 }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC4), driver_info: 47 }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5), driver_info: 45 }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6), driver_info: 46 }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC0), driver_info: 47 }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC4), driver_info: 48 }, /* some Intuos2 6x8's erroneously report as 0x47; * multiple confirmed examples exist. */ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.10/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.10/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.10/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.10/Makefile.in 2008-02-29 18:58:44.000000000 -0500 @@ -57,7 +57,7 @@ else # We were called from command line PWD := $(shell pwd) -KDIR := @WCM_KERNELDIR@ +WCM_KERNEL_DIR := @WCM_KERNEL_DIR@ WCM_OPTION_WACOM := @WCM_OPTION_WACOM@ WCM_OPTION_HID := @WCM_OPTION_HID@ @@ -70,15 +70,15 @@ # Copy hid-stuff from kernel-dir to local dir ifeq ($(WCM_OPTION_HID),yes) @for i in $(COPY_FROM_KERNEL_TREE); do \ - if test ! -f "$$i" && test -f $(KDIR)/drivers/usb/input/$$i ; then \ - cp $(KDIR)/drivers/usb/input/$$i .; \ + if test ! -f "$$i" && test -f $(WCM_KERNEL_DIR)/drivers/usb/input/$$i ; then \ + cp $(WCM_KERNEL_DIR)/drivers/usb/input/$$i .; \ fi; \ done endif @echo ' Building linuxwacom drivers for 2.6 kernel.' @echo '***Note: Drivers not enabled as modules in your kernel config but requested through configure are NOT built' - $(MAKE) -C $(KDIR) M=$(PWD) + $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) endif # End kbuild check diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.10/wacom.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.10/wacom.c --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.10/wacom.c 2008-03-29 02:02:53.000000000 -0400 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.10/wacom.c 2008-03-29 02:02:53.000000000 -0400 @@ -9,7 +9,7 @@ * Copyright (c) 2000 Daniel Egger * Copyright (c) 2001 Frederic Lepied * Copyright (c) 2004 Panagiotis Issaris - * Copyright (c) 2002-2007 Ping Cheng + * Copyright (c) 2002-2008 Ping Cheng * Copyright (c) 2004-2005 Ron Lee * * ChangeLog: @@ -68,6 +68,7 @@ * v1.40-2.6.10-pc-0.9 - Support Intuos outbound tracking * v1.40-2.6.10-pc-0.10 - Added Bamboo * v1.40-2.6.10-pc-0.11 - added Bamboo1, Bamboo Fun, and Hummingbird + * v1.40-2.6.10-pc-0.12 - Added Cintiq 20WSX */ /* @@ -89,7 +90,7 @@ /* * Version Information */ -#define DRIVER_VERSION "v1.40 - 2.6.10-pc-0.11" +#define DRIVER_VERSION "v1.40 - 2.6.10-pc-0.12" #define DRIVER_AUTHOR "Vojtech Pavlik " #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver" #define DRIVER_LICENSE "GPL" @@ -900,6 +901,7 @@ { "Wacom Intuos3 4x6", 10, 31496, 19685, 1023, 63, INTUOS3S, wacom_intuos_irq }, { "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, CINTIQ, wacom_intuos_irq }, { "Wacom DTF720", 8, 6858, 5506, 511, 0, PL, wacom_pl_irq }, + { "Wacom Cintiq 20WSX", 10, 86680, 54180, 1023, 63, BEE, wacom_intuos_irq }, { "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, BEE, wacom_intuos_irq }, { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS, wacom_intuos_irq }, { } @@ -953,6 +955,7 @@ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC0) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC4) }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) }, { } diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.11/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.11/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.11/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.11/Makefile.in 2008-02-29 18:58:44.000000000 -0500 @@ -58,7 +58,7 @@ else # We were called from command line PWD := $(shell pwd) -KDIR := @WCM_KERNELDIR@ +WCM_KERNEL_DIR := @WCM_KERNEL_DIR@ WCM_OPTION_WACOM := @WCM_OPTION_WACOM@ WCM_OPTION_HID := @WCM_OPTION_HID@ @@ -71,8 +71,8 @@ # Copy hid-stuff from kernel-dir to local dir ifeq ($(WCM_OPTION_HID),yes) @for i in $(COPY_FROM_KERNEL_TREE); do \ - if test ! -f "$$i" && test -f $(KDIR)/drivers/usb/input/$$i ; then \ - cp $(KDIR)/drivers/usb/input/$$i .; \ + if test ! -f "$$i" && test -f $(WCM_KERNEL_DIR)/drivers/usb/input/$$i ; then \ + cp $(WCM_KERNEL_DIR)/drivers/usb/input/$$i .; \ fi; \ done endif @@ -84,7 +84,7 @@ endif @echo ' Building linuxwacom drivers for 2.6 kernel.' @echo '***Note: Drivers not enabled as modules in your kernel config but requested through configure are NOT built' - $(MAKE) -C $(KDIR) M=$(PWD) + $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) endif # End kbuild check diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.13/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.13/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.13/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.13/Makefile.in 2008-02-29 18:58:44.000000000 -0500 @@ -58,7 +58,7 @@ else # We were called from command line PWD := $(shell pwd) -KDIR := @WCM_KERNELDIR@ +WCM_KERNEL_DIR := @WCM_KERNEL_DIR@ WCM_OPTION_WACOM := @WCM_OPTION_WACOM@ WCM_OPTION_HID := @WCM_OPTION_HID@ @@ -71,8 +71,8 @@ # Copy hid-stuff from kernel-dir to local dir ifeq ($(WCM_OPTION_HID),yes) @for i in $(COPY_FROM_KERNEL_TREE); do \ - if test ! -f "$$i" && test -f $(KDIR)/drivers/usb/input/$$i ; then \ - cp $(KDIR)/drivers/usb/input/$$i .; \ + if test ! -f "$$i" && test -f $(WCM_KERNEL_DIR)/drivers/usb/input/$$i ; then \ + cp $(WCM_KERNEL_DIR)/drivers/usb/input/$$i .; \ fi; \ done endif @@ -84,7 +84,7 @@ endif @echo ' Building linuxwacom drivers for 2.6 kernel.' @echo '***Note: Drivers not enabled as modules in your kernel config but requested through configure are NOT built' - $(MAKE) -C $(KDIR) M=$(PWD) + $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) endif # End kbuild check diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.14/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.14/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.14/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.14/Makefile.in 2008-02-29 18:58:44.000000000 -0500 @@ -58,7 +58,7 @@ else # We were called from command line PWD := $(shell pwd) -KDIR := @WCM_KERNELDIR@ +WCM_KERNEL_DIR := @WCM_KERNEL_DIR@ WCM_OPTION_WACOM := @WCM_OPTION_WACOM@ WCM_OPTION_HID := @WCM_OPTION_HID@ @@ -71,8 +71,8 @@ # Copy hid-stuff from kernel-dir to local dir ifeq ($(WCM_OPTION_HID),yes) @for i in $(COPY_FROM_KERNEL_TREE); do \ - if test ! -f "$$i" && test -f $(KDIR)/drivers/usb/input/$$i ; then \ - cp $(KDIR)/drivers/usb/input/$$i .; \ + if test ! -f "$$i" && test -f $(WCM_KERNEL_DIR)/drivers/usb/input/$$i ; then \ + cp $(WCM_KERNEL_DIR)/drivers/usb/input/$$i .; \ fi; \ done endif @@ -86,7 +86,7 @@ endif @echo ' Building linuxwacom drivers for 2.6 kernel.' @echo '***Note: Drivers not enabled as modules in your kernel config but requested through configure are NOT built' - $(MAKE) -C $(KDIR) M=$(PWD) + $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) endif # End kbuild check diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.15/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.15/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.15/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.15/Makefile.in 2008-02-29 18:58:44.000000000 -0500 @@ -58,7 +58,7 @@ else # We were called from command line PWD := $(shell pwd) -KDIR := @WCM_KERNELDIR@ +WCM_KERNEL_DIR := @WCM_KERNEL_DIR@ WCM_OPTION_WACOM := @WCM_OPTION_WACOM@ WCM_OPTION_HID := @WCM_OPTION_HID@ @@ -71,8 +71,8 @@ # Copy hid-stuff from kernel-dir to local dir ifeq ($(WCM_OPTION_HID),yes) @for i in $(COPY_FROM_KERNEL_TREE); do \ - if test ! -f "$$i" && test -f $(KDIR)/drivers/usb/input/$$i ; then \ - cp $(KDIR)/drivers/usb/input/$$i .; \ + if test ! -f "$$i" && test -f $(WCM_KERNEL_DIR)/drivers/usb/input/$$i ; then \ + cp $(WCM_KERNEL_DIR)/drivers/usb/input/$$i .; \ fi; \ done endif @@ -85,7 +85,7 @@ endif @echo ' Building linuxwacom drivers for 2.6 kernel.' @echo '***Note: Drivers not enabled as modules in your kernel config but requested through configure are NOT built' - $(MAKE) -C $(KDIR) M=$(PWD) + $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) endif # End kbuild check diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.16/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.16/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.16/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.16/Makefile.in 2008-02-29 18:58:44.000000000 -0500 @@ -58,7 +58,7 @@ else # We were called from command line PWD := $(shell pwd) -KDIR := @WCM_KERNELDIR@ +WCM_KERNEL_DIR := @WCM_KERNEL_DIR@ WCM_OPTION_WACOM := @WCM_OPTION_WACOM@ WCM_OPTION_HID := @WCM_OPTION_HID@ @@ -71,15 +71,15 @@ # Copy hid-stuff from kernel-dir to local dir ifeq ($(WCM_OPTION_HID),yes) @for i in $(COPY_FROM_KERNEL_TREE); do \ - if test ! -f "$$i" && test -f $(KDIR)/drivers/usb/input/$$i ; then \ - cp $(KDIR)/drivers/usb/input/$$i .; \ + if test ! -f "$$i" && test -f $(WCM_KERNEL_DIR)/drivers/usb/input/$$i ; then \ + cp $(WCM_KERNEL_DIR)/drivers/usb/input/$$i .; \ fi; \ done endif @echo ' Building linuxwacom drivers for 2.6 kernel.' @echo '***Note: Drivers not enabled as modules in your kernel config but requested through configure are NOT built' - $(MAKE) -C $(KDIR) M=$(PWD) + $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) endif # End kbuild check diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.16/wacom_wac.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.16/wacom_wac.c --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.16/wacom_wac.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.16/wacom_wac.c 2008-02-29 18:58:44.000000000 -0500 @@ -449,7 +449,7 @@ wacom_report_abs(wcombo, ABS_RX, ((data[1] & 0x1f) << 8) | data[2]); wacom_report_abs(wcombo, ABS_RY, ((data[3] & 0x1f) << 8) | data[4]); - if((data[5] & 0x1f) | (data[6] & 0x1f) | (data[1] & 0x1f) | + if ((data[5] & 0x1f) | (data[6] & 0x1f) | (data[1] & 0x1f) | data[2] | (data[3] & 0x1f) | data[4]) wacom_report_key(wcombo, wacom->tool[1], 1); else @@ -465,7 +465,7 @@ return result-1; /* Only large I3 and I1 & I2 support Lense Cursor */ - if((wacom->tool[idx] == BTN_TOOL_LENS) + if ((wacom->tool[idx] == BTN_TOOL_LENS) && ((wacom->features->type == INTUOS3) || (wacom->features->type == INTUOS3S))) return 0; @@ -658,6 +658,7 @@ { "Wacom Intuos3 6x11", 10, 54204, 31750, 1023, 63, INTUOS3 }, { "Wacom Intuos3 4x6", 10, 31496, 19685, 1023, 63, INTUOS3S }, { "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, CINTIQ }, + { "Wacom Cintiq 20WSX", 10, 86680, 54180, 1023, 63, WACOM_BEE }, { "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, WACOM_BEE }, { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS }, { } @@ -711,6 +712,7 @@ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) }, { } diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.18/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.18/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.18/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.18/Makefile.in 2008-02-29 18:58:44.000000000 -0500 @@ -16,7 +16,7 @@ else # We were called from command line PWD := $(shell pwd) -KDIR := @WCM_KERNELDIR@ +WCM_KERNEL_DIR := @WCM_KERNEL_DIR@ WCM_OPTION_WACOM := @WCM_OPTION_WACOM@ export WCM_OPTION_WACOM @@ -30,7 +30,7 @@ endif @echo ' Building linuxwacom drivers for 2.6 kernel.' @echo '***Note: Drivers not enabled as modules in your kernel config but requested through configure are NOT built' - $(MAKE) -C $(KDIR) M=$(PWD) + $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) endif # End kbuild check @@ -39,14 +39,6 @@ clean: rm -rf *.o *.ko *.mod.* .[a-z]* core *.i -# also remove copied stuff -distclean: clean - @for i in $(COPY_FROM_KERNEL_TREE); do \ - if test -f "$$i"; then \ - rm -f $$i ; \ - fi; \ - done - EMPTY_AUTOMAKE_TARGETS = distdir install install-data install-exec uninstall install-info EMPTY_AUTOMAKE_TARGETS += installdirs check dvi pdf ps info html tags ctags mostlyclean distclean maintainer-clean .PHONY: $(EMPTY_AUTOMAKE_TARGETS) diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.19/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.19/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.19/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.19/Makefile.in 2008-02-29 18:58:44.000000000 -0500 @@ -16,7 +16,7 @@ else # We were called from command line PWD := $(shell pwd) -KDIR := @WCM_KERNELDIR@ +WCM_KERNEL_DIR := @WCM_KERNEL_DIR@ WCM_OPTION_WACOM := @WCM_OPTION_WACOM@ export WCM_OPTION_WACOM @@ -28,7 +28,7 @@ endif @echo ' Building linuxwacom drivers for 2.6 kernel.' @echo '***Note: Drivers not enabled as modules in your kernel config but requested through configure are NOT built' - $(MAKE) -C $(KDIR) M=$(PWD) + $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) endif # End kbuild check @@ -37,14 +37,6 @@ clean: rm -rf *.o *.ko *.mod.* .[a-z]* core *.i -# also remove copied stuff -distclean: clean - @for i in $(COPY_FROM_KERNEL_TREE); do \ - if test -f "$$i"; then \ - rm -f $$i ; \ - fi; \ - done - EMPTY_AUTOMAKE_TARGETS = distdir install install-data install-exec uninstall install-info EMPTY_AUTOMAKE_TARGETS += installdirs check dvi pdf ps info html tags ctags mostlyclean distclean maintainer-clean .PHONY: $(EMPTY_AUTOMAKE_TARGETS) diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.19/wacom_wac.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.19/wacom_wac.c --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.19/wacom_wac.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.19/wacom_wac.c 2008-02-29 18:58:44.000000000 -0500 @@ -439,7 +439,7 @@ wacom_report_abs(wcombo, ABS_RX, ((data[1] & 0x1f) << 8) | data[2]); wacom_report_abs(wcombo, ABS_RY, ((data[3] & 0x1f) << 8) | data[4]); - if((data[5] & 0x1f) | (data[6] & 0x1f) | (data[1] & 0x1f) | + if ((data[5] & 0x1f) | (data[6] & 0x1f) | (data[1] & 0x1f) | data[2] | (data[3] & 0x1f) | data[4]) wacom_report_key(wcombo, wacom->tool[1], 1); else @@ -455,7 +455,7 @@ return result-1; /* Only large I3 and I1 & I2 support Lense Cursor */ - if((wacom->tool[idx] == BTN_TOOL_LENS) + if ((wacom->tool[idx] == BTN_TOOL_LENS) && ((wacom->features->type == INTUOS3) || (wacom->features->type == INTUOS3S))) return 0; @@ -649,6 +649,7 @@ { "Wacom Intuos3 6x11", 10, 54204, 31750, 1023, 63, INTUOS3 }, { "Wacom Intuos3 4x6", 10, 31496, 19685, 1023, 63, INTUOS3S }, { "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, CINTIQ }, + { "Wacom Cintiq 20WSX", 10, 86680, 54180, 1023, 63, WACOM_BEE }, { "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, WACOM_BEE }, { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS }, { } @@ -702,6 +703,7 @@ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) }, { } diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.22/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.22/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.22/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.22/Makefile.in 2008-02-29 18:58:44.000000000 -0500 @@ -16,7 +16,7 @@ else # We were called from command line PWD := $(shell pwd) -KDIR := @WCM_KERNELDIR@ +WCM_KERNEL_DIR := @WCM_KERNEL_DIR@ WCM_OPTION_WACOM := @WCM_OPTION_WACOM@ export WCM_OPTION_WACOM @@ -29,7 +29,7 @@ endif @echo ' Building linuxwacom drivers for 2.6 kernel.' @echo '***Note: Drivers not enabled as modules in your kernel config but requested through configure are NOT built' - $(MAKE) -C $(KDIR) M=$(PWD) + $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) endif # End kbuild check @@ -38,14 +38,6 @@ clean: rm -rf *.o *.ko *.mod.* .[a-z]* core *.i -# also remove copied stuff -distclean: clean - @for i in $(COPY_FROM_KERNEL_TREE); do \ - if test -f "$$i"; then \ - rm -f $$i ; \ - fi; \ - done - EMPTY_AUTOMAKE_TARGETS = distdir install install-data install-exec uninstall install-info EMPTY_AUTOMAKE_TARGETS += installdirs check dvi pdf ps info html tags ctags mostlyclean distclean maintainer-clean .PHONY: $(EMPTY_AUTOMAKE_TARGETS) diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.24/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.24/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.24/Makefile.in 1969-12-31 19:00:00.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.24/Makefile.in 2008-02-29 18:58:44.000000000 -0500 @@ -0,0 +1,45 @@ +############################ 2.6 kernel compile ############################### +ifneq ($(KERNELRELEASE),) +# We were called by kbuild +# Do NOT indent stuff in this part! It has to be like this to make the +# $(error ... ) stuff work + +ifeq ($(WCM_OPTION_WACOM),yes) +ifneq ($(CONFIG_USB_WACOM),y) +wacom-objs := wacom_wac.o wacom_sys.o +obj-m += wacom.o +else +$(error You requested to build wacom with configure, but wacom is configured as built-in in your kernel config) +endif # CONFIG_USB_WACOM +endif # WCM_OPTION_WACOM + +else # We were called from command line +PWD := $(shell pwd) + +WCM_KERNEL_DIR := @WCM_KERNEL_DIR@ +WCM_OPTION_WACOM := @WCM_OPTION_WACOM@ + +export WCM_OPTION_WACOM + +all: +# Copy Wacom specific code which is common to all kernel releases +ifeq ($(WCM_OPTION_WACOM),yes) + cp -f ../2.6.19/wacom_wac.c . + cp -f ../2.6.19/wacom.h . + cp -f ../2.6.22/wacom_wac.h . +endif + @echo ' Building linuxwacom drivers for 2.6 kernel.' + @echo '***Note: Drivers not enabled as modules in your kernel config but requested through configure are NOT built' + $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) + +endif # End kbuild check + +######################### Version independent targets ########################## + +clean: + rm -rf *.o *.ko *.mod.* .[a-z]* core *.i + +EMPTY_AUTOMAKE_TARGETS = distdir install install-data install-exec uninstall install-info +EMPTY_AUTOMAKE_TARGETS += installdirs check dvi pdf ps info html tags ctags mostlyclean distclean maintainer-clean +.PHONY: $(EMPTY_AUTOMAKE_TARGETS) + $(EMPTY_AUTOMAKE_TARGETS): diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.24/wacom_sys.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.24/wacom_sys.c --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.24/wacom_sys.c 1969-12-31 19:00:00.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.24/wacom_sys.c 2008-02-29 18:58:44.000000000 -0500 @@ -0,0 +1,343 @@ +/* + * drivers/input/tablet/wacom_sys.c + * + * USB Wacom Graphire and Wacom Intuos tablet support - system specific code + */ + +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include "wacom.h" +#include "wacom_wac.h" + +#define USB_REQ_GET_REPORT 0x01 +#define USB_REQ_SET_REPORT 0x09 + +static int usb_get_report(struct usb_interface *intf, unsigned char type, + unsigned char id, void *buf, int size) +{ + return usb_control_msg(interface_to_usbdev(intf), + usb_rcvctrlpipe(interface_to_usbdev(intf), 0), + USB_REQ_GET_REPORT, + USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, + (type << 8) + id, intf->altsetting[0].desc.bInterfaceNumber, + buf, size, 100); +} + +static int usb_set_report(struct usb_interface *intf, unsigned char type, + unsigned char id, void *buf, int size) +{ + return usb_control_msg(interface_to_usbdev(intf), + usb_sndctrlpipe(interface_to_usbdev(intf), 0), + USB_REQ_SET_REPORT, + USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT, + (type << 8) + id, intf->altsetting[0].desc.bInterfaceNumber, + buf, size, 1000); +} + +static struct input_dev * get_input_dev(struct wacom_combo *wcombo) +{ + return wcombo->wacom->dev; +} + +static void wacom_sys_irq(struct urb *urb) +{ + struct wacom *wacom = urb->context; + struct wacom_combo wcombo; + int retval; + + switch (urb->status) { + case 0: + /* success */ + break; + case -ECONNRESET: + case -ENOENT: + case -ESHUTDOWN: + /* this urb is terminated, clean up */ + dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); + return; + default: + dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); + goto exit; + } + + wcombo.wacom = wacom; + wcombo.urb = urb; + + if (wacom_wac_irq(wacom->wacom_wac, (void *)&wcombo)) + input_sync(get_input_dev(&wcombo)); + + exit: + retval = usb_submit_urb (urb, GFP_ATOMIC); + if (retval) + err ("%s - usb_submit_urb failed with result %d", + __FUNCTION__, retval); +} + +void wacom_report_key(void *wcombo, unsigned int key_type, int key_data) +{ + input_report_key(get_input_dev((struct wacom_combo *)wcombo), key_type, key_data); + return; +} + +void wacom_report_abs(void *wcombo, unsigned int abs_type, int abs_data) +{ + input_report_abs(get_input_dev((struct wacom_combo *)wcombo), abs_type, abs_data); + return; +} + +void wacom_report_rel(void *wcombo, unsigned int rel_type, int rel_data) +{ + input_report_rel(get_input_dev((struct wacom_combo *)wcombo), rel_type, rel_data); + return; +} + +void wacom_input_event(void *wcombo, unsigned int type, unsigned int code, int value) +{ + input_event(get_input_dev((struct wacom_combo *)wcombo), type, code, value); + return; +} + +__u16 wacom_be16_to_cpu(unsigned char *data) +{ + __u16 value; + value = be16_to_cpu(*(__be16 *) data); + return value; +} + +__u16 wacom_le16_to_cpu(unsigned char *data) +{ + __u16 value; + value = le16_to_cpu(*(__le16 *) data); + return value; +} + +void wacom_input_sync(void *wcombo) +{ + input_sync(get_input_dev((struct wacom_combo *)wcombo)); + return; +} + +static int wacom_open(struct input_dev *dev) +{ + struct wacom *wacom = input_get_drvdata(dev); + + wacom->irq->dev = wacom->usbdev; + if (usb_submit_urb(wacom->irq, GFP_KERNEL)) + return -EIO; + + return 0; +} + +static void wacom_close(struct input_dev *dev) +{ + struct wacom *wacom = input_get_drvdata(dev); + + usb_kill_urb(wacom->irq); +} + +void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac) +{ + input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_1) | + BIT_MASK(BTN_5); + input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0); +} + +void input_dev_g4(struct input_dev *input_dev, struct wacom_wac *wacom_wac) +{ + input_dev->evbit[0] |= BIT_MASK(EV_MSC); + input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL); + input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER); + input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_0) | + BIT_MASK(BTN_4); +} + +void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac) +{ + input_dev->evbit[0] |= BIT_MASK(EV_REL); + input_dev->relbit[0] |= BIT_MASK(REL_WHEEL); + input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) | + BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE); + input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) | + BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_STYLUS2); + input_set_abs_params(input_dev, ABS_DISTANCE, 0, wacom_wac->features->distance_max, 0, 0); +} + +void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac) +{ + input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER); + input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_0) | + BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3); + input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0); + input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0); +} + +void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac) +{ + input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_4) | + BIT_MASK(BTN_5) | BIT_MASK(BTN_6) | BIT_MASK(BTN_7); + input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0); +} + +void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac) +{ + input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_8) | BIT_MASK(BTN_9); +} + +void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac) +{ + input_dev->evbit[0] |= BIT_MASK(EV_MSC) | BIT_MASK(EV_REL); + input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL); + input_dev->relbit[0] |= BIT_MASK(REL_WHEEL); + input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) | + BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE) | + BIT_MASK(BTN_SIDE) | BIT_MASK(BTN_EXTRA); + input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) | + BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_TOOL_BRUSH) | + BIT_MASK(BTN_TOOL_PENCIL) | BIT_MASK(BTN_TOOL_AIRBRUSH) | + BIT_MASK(BTN_TOOL_LENS) | BIT_MASK(BTN_STYLUS2); + input_set_abs_params(input_dev, ABS_DISTANCE, 0, wacom_wac->features->distance_max, 0, 0); + input_set_abs_params(input_dev, ABS_WHEEL, 0, 1023, 0, 0); + input_set_abs_params(input_dev, ABS_TILT_X, 0, 127, 0, 0); + input_set_abs_params(input_dev, ABS_TILT_Y, 0, 127, 0, 0); + input_set_abs_params(input_dev, ABS_RZ, -900, 899, 0, 0); + input_set_abs_params(input_dev, ABS_THROTTLE, -1023, 1023, 0, 0); +} + +void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac) +{ + input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_STYLUS2) | + BIT_MASK(BTN_TOOL_RUBBER); +} + +void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac) +{ + input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER); +} + +static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *id) +{ + struct usb_device *dev = interface_to_usbdev(intf); + struct usb_endpoint_descriptor *endpoint; + struct wacom *wacom; + struct wacom_wac *wacom_wac; + struct input_dev *input_dev; + int error = -ENOMEM; + char rep_data[2], limit = 0; + + wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL); + wacom_wac = kzalloc(sizeof(struct wacom_wac), GFP_KERNEL); + input_dev = input_allocate_device(); + if (!wacom || !input_dev || !wacom_wac) + goto fail1; + + wacom_wac->data = usb_buffer_alloc(dev, 10, GFP_KERNEL, &wacom->data_dma); + if (!wacom_wac->data) + goto fail1; + + wacom->irq = usb_alloc_urb(0, GFP_KERNEL); + if (!wacom->irq) + goto fail2; + + wacom->usbdev = dev; + wacom->dev = input_dev; + usb_make_path(dev, wacom->phys, sizeof(wacom->phys)); + strlcat(wacom->phys, "/input0", sizeof(wacom->phys)); + + wacom_wac->features = get_wacom_feature(id); + BUG_ON(wacom_wac->features->pktlen > 10); + + input_dev->name = wacom_wac->features->name; + wacom->wacom_wac = wacom_wac; + usb_to_input_id(dev, &input_dev->id); + + input_dev->dev.parent = &intf->dev; + + input_set_drvdata(input_dev, wacom); + + input_dev->open = wacom_open; + input_dev->close = wacom_close; + + input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); + input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) | + BIT_MASK(BTN_TOUCH) | BIT_MASK(BTN_STYLUS); + input_set_abs_params(input_dev, ABS_X, 0, wacom_wac->features->x_max, 4, 0); + input_set_abs_params(input_dev, ABS_Y, 0, wacom_wac->features->y_max, 4, 0); + input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom_wac->features->pressure_max, 0, 0); + input_dev->absbit[BIT_WORD(ABS_MISC)] |= BIT_MASK(ABS_MISC); + + wacom_init_input_dev(input_dev, wacom_wac); + + endpoint = &intf->cur_altsetting->endpoint[0].desc; + + usb_fill_int_urb(wacom->irq, dev, + usb_rcvintpipe(dev, endpoint->bEndpointAddress), + wacom_wac->data, wacom_wac->features->pktlen, + wacom_sys_irq, wacom, endpoint->bInterval); + wacom->irq->transfer_dma = wacom->data_dma; + wacom->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; + + error = input_register_device(wacom->dev); + if (error) + goto fail3; + + /* Ask the tablet to report tablet data. Repeat until it succeeds */ + do { + rep_data[0] = rep_data[1] = 2; + if(usb_set_report(intf, 3, 2, rep_data, 2) >= 0) + error = usb_get_report(intf, 3, 2, rep_data, 2); + } while ((error <= 0 || rep_data[1] != 2) && limit++ < 5); + + usb_set_intfdata(intf, wacom); + return 0; + + fail3: usb_free_urb(wacom->irq); + fail2: usb_buffer_free(dev, 10, wacom_wac->data, wacom->data_dma); + fail1: input_free_device(input_dev); + kfree(wacom); + kfree(wacom_wac); + return error; +} + +static void wacom_disconnect(struct usb_interface *intf) +{ + struct wacom *wacom = usb_get_intfdata (intf); + + usb_set_intfdata(intf, NULL); + if (wacom) { + usb_kill_urb(wacom->irq); + input_unregister_device(wacom->dev); + usb_free_urb(wacom->irq); + usb_buffer_free(interface_to_usbdev(intf), 10, wacom->wacom_wac->data, wacom->data_dma); + kfree(wacom->wacom_wac); + kfree(wacom); + } +} + +static struct usb_driver wacom_driver = { + .name = "wacom", + .probe = wacom_probe, + .disconnect = wacom_disconnect, +}; + +static int __init wacom_init(void) +{ + int result; + wacom_driver.id_table = get_device_table(); + result = usb_register(&wacom_driver); + if (result == 0) + info(DRIVER_VERSION ":" DRIVER_DESC); + return result; +} + +static void __exit wacom_exit(void) +{ + usb_deregister(&wacom_driver); +} + +module_init(wacom_init); +module_exit(wacom_exit); diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.8/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.8/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.8/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.8/Makefile.in 2008-02-29 18:58:44.000000000 -0500 @@ -57,7 +57,7 @@ else # We were called from command line PWD := $(shell pwd) -KDIR := @WCM_KERNELDIR@ +WCM_KERNEL_DIR := @WCM_KERNEL_DIR@ WCM_OPTION_WACOM := @WCM_OPTION_WACOM@ WCM_OPTION_HID := @WCM_OPTION_HID@ @@ -70,15 +70,15 @@ # Copy hid-stuff from kernel-dir to local dir ifeq ($(WCM_OPTION_HID),yes) @for i in $(COPY_FROM_KERNEL_TREE); do \ - if test ! -f "$$i" && test -f $(KDIR)/drivers/usb/input/$$i ; then \ - cp $(KDIR)/drivers/usb/input/$$i .; \ + if test ! -f "$$i" && test -f $(WCM_KERNEL_DIR)/drivers/usb/input/$$i ; then \ + cp $(WCM_KERNEL_DIR)/drivers/usb/input/$$i .; \ fi; \ done endif @echo ' Building linuxwacom drivers for 2.6 kernel.' @echo '***Note: Drivers not enabled as modules in your kernel config but requested through configure are NOT built' - $(MAKE) -C $(KDIR) M=$(PWD) + $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) endif # End kbuild check diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.8/wacom.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.8/wacom.c --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.8/wacom.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.8/wacom.c 2008-02-29 18:58:44.000000000 -0500 @@ -9,7 +9,7 @@ * Copyright (c) 2000 Daniel Egger * Copyright (c) 2001 Frederic Lepied * Copyright (c) 2004 Panagiotis Issaris - * Copyright (c) 2002-2007 Ping Cheng + * Copyright (c) 2002-2008 Ping Cheng * * ChangeLog: * v0.1 (vp) - Initial release @@ -68,6 +68,7 @@ * v1.40-2.6.8-pc-0.11 - Support Intuos outbound tracking * v1.40-2.6.8-pc-0.12 - Added Bamboo * v1.40-2.6.8-pc-0.13 - added Bamboo1, Bamboo Fun, and Hummingbird + * v1.40-2.6.8-pc-0.14 - Added Cintiq 20WSX */ /* @@ -89,7 +90,7 @@ /* * Version Information */ -#define DRIVER_VERSION "v1.40 - 2.6.8-pc-0.13" +#define DRIVER_VERSION "v1.40 - 2.6.8-pc-0.14" #define DRIVER_AUTHOR "Vojtech Pavlik " #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver" #define DRIVER_LICENSE "GPL" @@ -889,6 +890,7 @@ { "Wacom Intuos3 6x11", 10, 54204, 31750, 1023, 63, INTUOS3, wacom_intuos_irq }, { "Wacom Intuos3 4x6", 10, 31496, 19685, 1023, 63, INTUOS3S, wacom_intuos_irq }, { "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, CINTIQ, wacom_intuos_irq }, + { "Wacom Cintiq 20WSX", 10, 86680, 54180, 1023, 63, BEE, wacom_intuos_irq }, { "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, BEE, wacom_intuos_irq }, { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS, wacom_intuos_irq }, { } @@ -942,6 +944,7 @@ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) }, { } diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.9/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.9/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.9/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.9/Makefile.in 2008-02-29 18:58:44.000000000 -0500 @@ -57,7 +57,7 @@ else # We were called from command line PWD := $(shell pwd) -KDIR := @WCM_KERNELDIR@ +WCM_KERNEL_DIR := @WCM_KERNEL_DIR@ WCM_OPTION_WACOM := @WCM_OPTION_WACOM@ WCM_OPTION_HID := @WCM_OPTION_HID@ @@ -70,15 +70,15 @@ # Copy hid-stuff from kernel-dir to local dir ifeq ($(WCM_OPTION_HID),yes) @for i in $(COPY_FROM_KERNEL_TREE); do \ - if test ! -f "$$i" && test -f $(KDIR)/drivers/usb/input/$$i ; then \ - cp $(KDIR)/drivers/usb/input/$$i .; \ + if test ! -f "$$i" && test -f $(WCM_KERNEL_DIR)/drivers/usb/input/$$i ; then \ + cp $(WCM_KERNEL_DIR)/drivers/usb/input/$$i .; \ fi; \ done endif @echo ' Building linuxwacom drivers for 2.6 kernel.' @echo '***Note: Drivers not enabled as modules in your kernel config but requested through configure are NOT built' - $(MAKE) -C $(KDIR) M=$(PWD) + $(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD) endif # End kbuild check diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/2.6.9/wacom.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/2.6.9/wacom.c --- wacom-tools-0.7.9.3/linuxwacom/src/2.6.9/wacom.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/2.6.9/wacom.c 2008-02-29 18:58:44.000000000 -0500 @@ -9,7 +9,7 @@ * Copyright (c) 2000 Daniel Egger * Copyright (c) 2001 Frederic Lepied * Copyright (c) 2004 Panagiotis Issaris - * Copyright (c) 2002-2007 Ping Cheng + * Copyright (c) 2002-2008 Ping Cheng * * ChangeLog: * v0.1 (vp) - Initial release @@ -67,6 +67,7 @@ * v1.40-2.6.9-pc-0.10 - Support Intuos outbound tracking * v1.40-2.6.9-pc-0.11 - Added Bamboo * v1.40-2.6.9-pc-0.12 - added Bamboo1, Bamboo Fun, and Hummingbird + * v1.40-2.6.9-pc-0.13 - Added Cintiq 20WSX */ /* @@ -88,7 +89,7 @@ /* * Version Information */ -#define DRIVER_VERSION "v1.40 - 2.6.9-pc-0.12" +#define DRIVER_VERSION "v1.40 - 2.6.9-pc-0.13" #define DRIVER_AUTHOR "Vojtech Pavlik " #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver" #define DRIVER_LICENSE "GPL" @@ -889,6 +890,7 @@ { "Wacom Intuos3 6x11", 10, 54204, 31750, 1023, 63, INTUOS3, wacom_intuos_irq }, { "Wacom Intuos3 4x6", 10, 31496, 19685, 1023, 63, INTUOS3S, wacom_intuos_irq }, { "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, CINTIQ, wacom_intuos_irq }, + { "Wacom Cintiq 20WSX", 10, 86680, 54180, 1023, 63, BEE, wacom_intuos_irq }, { "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, BEE, wacom_intuos_irq }, { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS, wacom_intuos_irq }, { } @@ -942,6 +944,7 @@ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) }, + { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) }, { } diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/include/kernel-config.h.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/include/kernel-config.h.in --- wacom-tools-0.7.9.3/linuxwacom/src/include/kernel-config.h.in 1969-12-31 19:00:00.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/include/kernel-config.h.in 2008-02-29 18:58:44.000000000 -0500 @@ -0,0 +1,9 @@ +/* kernel-config.h.in */ + +#ifndef _KERNEL_CONFIG_H_ +#define _KERNEL_CONFIG_H_ + +/* Do not need the dr.wValue patch */ +#undef WCM_PATCH_DRVALUE + +#endif /* _KERNEL_CONFIG_H_ */ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/include/util-config.h.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/include/util-config.h.in --- wacom-tools-0.7.9.3/linuxwacom/src/include/util-config.h.in 1969-12-31 19:00:00.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/include/util-config.h.in 2008-02-29 18:58:44.000000000 -0500 @@ -0,0 +1,15 @@ +/* util-config.h.in */ + +#ifndef _UTIL_CONFIG_H_ +#define _UTIL_CONFIG_H_ + +/* ncurses header files available */ +#undef WCM_ENABLE_NCURSES + +/* Enable the Linux Input subsystem */ +#undef WCM_ENABLE_LINUXINPUT + +/* IsXExtensionPointer is only defined in later X.org releases */ +#undef WCM_ISXEXTENSIONPOINTER + +#endif /* _UTIL_CONFIG_H_ */ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/include/xdrv-config.h.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/include/xdrv-config.h.in --- wacom-tools-0.7.9.3/linuxwacom/src/include/xdrv-config.h.in 1969-12-31 19:00:00.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/include/xdrv-config.h.in 2008-02-29 18:58:44.000000000 -0500 @@ -0,0 +1,59 @@ +/* xdrv-config.h.in */ + +#ifndef _XDRV_CONFIG_H_ +#define _XDRV_CONFIG_H_ + +/* Misc defines moved from the command line */ +#undef AVOID_GLYPHBLT +#undef _BSD_SOURCE +#undef BUILDDEBUG +#undef DPMSExtension +#undef FUNCPROTO +#undef GCCUSESGAS +#undef _GNU_SOURCE +#undef IN_MODULE +#undef LBX +#undef linux +#undef NARROWPROTO +#undef NDEBUG +#undef PIXPRIV +#undef _POSIX_C_SOURCE +#undef _POSIX_SOURCE +#undef RENDER +#undef SHAPE +#undef SINGLEDEPTH +#undef SMART_SCHEDULE +#undef _SVID_SOURCE +#undef TOGCUP +#undef XAPPGROUP +#undef X_BYTE_ORDER +#undef XCSECURITY +#undef XF86BIGFONT +#undef XF86VIDMODE +#undef XFree86LOADER +#undef XFree86Module +#undef XFree86Server +#undef XFreeXDGA +#undef XINPUT +#undef XKB +#undef _XOPEN_SOURCE +#undef XResExtension +#undef XvExtension +#undef XvMCExtension + +/* Compiling for X.org */ +#undef WCM_XORG + +/* Compiling for XFree86 */ +#undef WCM_XFREE86 + +/* Enable the Linux Input subsystem */ +#undef WCM_ENABLE_LINUXINPUT + +/* The xserver have no wraps around libc-functions */ +#undef WCM_NO_LIBCWRAPPER + +/* Some X.org versions require that the events are scaled to screen size */ +#undef WCM_XORG_TABLET_SCALING + +#endif /* _XDRV_CONFIG_H_ */ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/include/Xwacom.h /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/include/Xwacom.h --- wacom-tools-0.7.9.3/linuxwacom/src/include/Xwacom.h 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/include/Xwacom.h 2008-02-29 18:58:44.000000000 -0500 @@ -1,6 +1,6 @@ /* * Copyright 2003 by John Joganic - * Copyright 2003 - 2007 by Ping Cheng + * Copyright 2003 - 2008 by Ping Cheng * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -152,6 +152,7 @@ #define AC_KEY 0x00010000 /* Emit key events */ #define AC_MODETOGGLE 0x00020000 /* Toggle absolute/relative mode */ #define AC_DBLCLICK 0x00030000 /* Emit a button1 double-click event */ +#define AC_DISPLAYTOGGLE 0x00040000 /* Toggle among screens */ #define AC_TYPE 0x000f0000 /* The mask to isolate event type bits */ #define AC_NUM_KEYS 0x0ff00000 /* The mask to isolate number of keys to send */ #define AC_CORE 0x10000000 /* Always emit a core event */ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/Makefile.am /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/Makefile.am --- wacom-tools-0.7.9.3/linuxwacom/src/Makefile.am 2008-03-29 02:02:53.000000000 -0400 +++ wacom-tools-0.7.9.8/linuxwacom/src/Makefile.am 2008-03-29 02:02:53.000000000 -0400 @@ -1,6 +1,6 @@ SUBDIRS = . wacomxi util xdrv #@WCM_KERNEL_VER@ -wmanpagedir = /usr/share/man/man4 +wmanpagedir = @mandir@/man4 wmanpage_HEADERS = wacom.4x.gz EXTRA_DIST = wacom.4x diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/Makefile.in 2008-03-29 02:02:53.000000000 -0400 +++ wacom-tools-0.7.9.8/linuxwacom/src/Makefile.in 2008-03-29 02:02:53.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -40,8 +36,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(wmanpage_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -51,10 +46,11 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -64,13 +60,13 @@ am__installdirs = "$(DESTDIR)$(wmanpagedir)" wmanpageHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(wmanpage_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -89,6 +85,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -98,6 +95,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -109,9 +107,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -126,21 +124,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TCLSH = @TCLSH@ VERSION = @VERSION@ -WACOMXI_INSTALL_FALSE = @WACOMXI_INSTALL_FALSE@ -WACOMXI_INSTALL_TRUE = @WACOMXI_INSTALL_TRUE@ WCM_ARCH = @WCM_ARCH@ WCM_CFLAGS_STACK_PROTECTOR = @WCM_CFLAGS_STACK_PROTECTOR@ WCM_DEPFLAGS = @WCM_DEPFLAGS@ -WCM_DLLOADER_FALSE = @WCM_DLLOADER_FALSE@ -WCM_DLLOADER_TRUE = @WCM_DLLOADER_TRUE@ -WCM_ENV_NCURSES_FALSE = @WCM_ENV_NCURSES_FALSE@ -WCM_ENV_NCURSES_TRUE = @WCM_ENV_NCURSES_TRUE@ -WCM_ENV_XF86_FALSE = @WCM_ENV_XF86_FALSE@ -WCM_ENV_XF86_TRUE = @WCM_ENV_XF86_TRUE@ -WCM_ENV_XORGSDK_FALSE = @WCM_ENV_XORGSDK_FALSE@ -WCM_ENV_XORGSDK_TRUE = @WCM_ENV_XORGSDK_TRUE@ WCM_EXPMODULES = @WCM_EXPMODULES@ WCM_EXPPROGS = @WCM_EXPPROGS@ WCM_KERNELDIR = @WCM_KERNELDIR@ @@ -182,13 +169,13 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -200,6 +187,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -227,10 +215,13 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = . wacomxi util xdrv #@WCM_KERNEL_VER@ -wmanpagedir = /usr/share/man/man4 +wmanpagedir = @mandir@/man4 wmanpage_HEADERS = wacom.4x.gz EXTRA_DIST = wacom.4x all: all-recursive @@ -271,13 +262,9 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-wmanpageHEADERS: $(wmanpage_HEADERS) @$(NORMAL_INSTALL) - test -z "$(wmanpagedir)" || $(mkdir_p) "$(DESTDIR)$(wmanpagedir)" + test -z "$(wmanpagedir)" || $(MKDIR_P) "$(DESTDIR)$(wmanpagedir)" @list='$(wmanpage_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -324,8 +311,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -369,8 +355,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -395,8 +381,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -406,13 +392,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -426,22 +411,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -455,7 +439,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -463,6 +447,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -473,7 +459,7 @@ installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(wmanpagedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -505,8 +491,7 @@ distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -520,12 +505,20 @@ install-data-am: install-wmanpageHEADERS +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -544,23 +537,24 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-wmanpageHEADERS +uninstall-am: uninstall-wmanpageHEADERS -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip \ - install-wmanpageHEADERS installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip install-wmanpageHEADERS \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ uninstall-wmanpageHEADERS diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/util/Makefile.am /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/util/Makefile.am --- wacom-tools-0.7.9.3/linuxwacom/src/util/Makefile.am 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/util/Makefile.am 2008-02-29 18:58:44.000000000 -0500 @@ -1,11 +1,10 @@ -bin_PROGRAMS = @WCM_PROGS@ @WCM_XF86PROGS@ +bin_PROGRAMS = @WCM_PROGS@ lib_LTLIBRARIES = libwacomcfg.la wacomcfgdir = $(includedir)/wacomcfg wacomcfg_HEADERS = wacomcfg.h AM_CFLAGS = -Wall -pedantic -DEPFLAGS = @WCM_DEPFLAGS@ # These identify which programs, libraries, and headers could # potentially be built or installed depending on the results of @@ -17,7 +16,9 @@ wactablet.c wactablet.h \ wacserial.c wacserial.h \ wacusb.c wacusb.h +if WCM_ENV_NCURSES wacdump_LDADD = -lncurses +endif xidump_SOURCES = xidump.c wacscrn.c wacscrn.h xidump_LDFLAGS = @WCM_XIDUMP_LIBS@ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/util/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/util/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/util/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/util/Makefile.in 2008-03-29 02:02:53.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,15 +16,11 @@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -38,18 +34,18 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = @WCM_PROGS@ @WCM_XF86PROGS@ EXTRA_PROGRAMS = wacdump$(EXEEXT) xidump$(EXEEXT) xsetwacom$(EXEEXT) subdir = src/util DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(wacomcfg_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/src/include/xdrv-config.h \ + $(top_builddir)/src/include/kernel-config.h \ + $(top_builddir)/src/include/util-config.h CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -64,6 +60,9 @@ libwacomcfg_la_DEPENDENCIES = am_libwacomcfg_la_OBJECTS = wacomcfg.lo libwacomcfg_la_OBJECTS = $(am_libwacomcfg_la_OBJECTS) +libwacomcfg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libwacomcfg_la_LDFLAGS) $(LDFLAGS) -o $@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_wacdump_OBJECTS = wacdump.$(OBJEXT) wacscrn.$(OBJEXT) \ @@ -73,20 +72,24 @@ am_xidump_OBJECTS = xidump.$(OBJEXT) wacscrn.$(OBJEXT) xidump_OBJECTS = $(am_xidump_OBJECTS) xidump_DEPENDENCIES = +xidump_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(xidump_LDFLAGS) \ + $(LDFLAGS) -o $@ am_xsetwacom_OBJECTS = xsetwacom.$(OBJEXT) wcmAction.$(OBJEXT) xsetwacom_OBJECTS = $(am_xsetwacom_OBJECTS) xsetwacom_DEPENDENCIES = libwacomcfg.la -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(libwacomcfg_la_SOURCES) $(wacdump_SOURCES) \ $(xidump_SOURCES) $(xsetwacom_SOURCES) DIST_SOURCES = $(libwacomcfg_la_SOURCES) $(wacdump_SOURCES) \ @@ -97,8 +100,6 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -117,6 +118,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -126,6 +128,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -137,9 +140,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -156,51 +159,35 @@ STRIP = @STRIP@ TCLSH = @TCLSH@ VERSION = @VERSION@ -WACOMXI_INSTALL_FALSE = @WACOMXI_INSTALL_FALSE@ -WACOMXI_INSTALL_TRUE = @WACOMXI_INSTALL_TRUE@ WCM_ARCH = @WCM_ARCH@ -WCM_CFLAGS_STACK_PROTECTOR = @WCM_CFLAGS_STACK_PROTECTOR@ +WCM_CLEVEL = @WCM_CLEVEL@ WCM_DEPFLAGS = @WCM_DEPFLAGS@ -WCM_DLLOADER_FALSE = @WCM_DLLOADER_FALSE@ -WCM_DLLOADER_TRUE = @WCM_DLLOADER_TRUE@ -WCM_ENV_NCURSES_FALSE = @WCM_ENV_NCURSES_FALSE@ -WCM_ENV_NCURSES_TRUE = @WCM_ENV_NCURSES_TRUE@ -WCM_ENV_XF86_FALSE = @WCM_ENV_XF86_FALSE@ -WCM_ENV_XF86_TRUE = @WCM_ENV_XF86_TRUE@ -WCM_ENV_XORGSDK_FALSE = @WCM_ENV_XORGSDK_FALSE@ -WCM_ENV_XORGSDK_TRUE = @WCM_ENV_XORGSDK_TRUE@ -WCM_EXPMODULES = @WCM_EXPMODULES@ -WCM_EXPPROGS = @WCM_EXPPROGS@ -WCM_KERNELDIR = @WCM_KERNELDIR@ +WCM_KERNEL_DIR = @WCM_KERNEL_DIR@ WCM_KERNEL_VER = @WCM_KERNEL_VER@ WCM_KSTACK = @WCM_KSTACK@ WCM_LIBS = @WCM_LIBS@ WCM_LIBWACOMCFG_LIBS = @WCM_LIBWACOMCFG_LIBS@ WCM_LIBWACOMCFG_VER = @WCM_LIBWACOMCFG_VER@ -WCM_LINUXWACOMDIR = @WCM_LINUXWACOMDIR@ -WCM_LINUX_INPUT = @WCM_LINUX_INPUT@ WCM_MODDIR = @WCM_MODDIR@ WCM_MODULES = @WCM_MODULES@ WCM_MODVER = @WCM_MODVER@ WCM_NO_MERGE_CONSTANTS = @WCM_NO_MERGE_CONSTANTS@ +WCM_NO_STACK_PROTECTOR = @WCM_NO_STACK_PROTECTOR@ WCM_OPTION_EVDEV = @WCM_OPTION_EVDEV@ WCM_OPTION_HID = @WCM_OPTION_HID@ WCM_OPTION_INPUT = @WCM_OPTION_INPUT@ WCM_OPTION_MOUSEDEV = @WCM_OPTION_MOUSEDEV@ WCM_OPTION_USBMOUSE = @WCM_OPTION_USBMOUSE@ WCM_OPTION_WACOM = @WCM_OPTION_WACOM@ +WCM_PREFIX = @WCM_PREFIX@ WCM_PROGS = @WCM_PROGS@ WCM_TCLLIBS = @WCM_TCLLIBS@ WCM_TCLPKGS = @WCM_TCLPKGS@ -WCM_WACOMXI_BINDIR = @WCM_WACOMXI_BINDIR@ -WCM_WACOMXI_LIBDIR = @WCM_WACOMXI_LIBDIR@ WCM_WACOMXI_LIBS = @WCM_WACOMXI_LIBS@ -WCM_XF86DIR = @WCM_XF86DIR@ WCM_XF86MODULES = @WCM_XF86MODULES@ -WCM_XF86PROGS = @WCM_XF86PROGS@ +WCM_XFREE86_DIR = @WCM_XFREE86_DIR@ WCM_XIDUMP_LIBS = @WCM_XIDUMP_LIBS@ -WCM_XLIBDIR = @WCM_XLIBDIR@ -WCM_XORGSDK = @WCM_XORGSDK@ +WCM_XORGSDK_DIR = @WCM_XORGSDK_DIR@ WCM_XSERVER64 = @WCM_XSERVER64@ WCM_XSETWACOM_LIBS = @WCM_XSETWACOM_LIBS@ XMKMF = @XMKMF@ @@ -210,13 +197,15 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ +Xlib_CFLAGS = @Xlib_CFLAGS@ +Xlib_LIBS = @Xlib_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -228,6 +217,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -255,13 +245,16 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +bin_PROGRAMS = @WCM_PROGS@ lib_LTLIBRARIES = libwacomcfg.la wacomcfgdir = $(includedir)/wacomcfg wacomcfg_HEADERS = wacomcfg.h AM_CFLAGS = -Wall -pedantic -DEPFLAGS = @WCM_DEPFLAGS@ # Source dependencies wacdump_SOURCES = wacdump.c wacscrn.c wacscrn.h \ @@ -269,7 +262,7 @@ wacserial.c wacserial.h \ wacusb.c wacusb.h -wacdump_LDADD = -lncurses +@WCM_ENV_NCURSES_TRUE@wacdump_LDADD = -lncurses xidump_SOURCES = xidump.c wacscrn.c wacscrn.h xidump_LDFLAGS = @WCM_XIDUMP_LIBS@ @WCM_ENV_NCURSES_TRUE@xidump_LDADD = -lncurses @@ -313,21 +306,21 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: @@ -339,18 +332,18 @@ rm -f "$${dir}/so_locations"; \ done libwacomcfg.la: $(libwacomcfg_la_OBJECTS) $(libwacomcfg_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libwacomcfg_la_LDFLAGS) $(libwacomcfg_la_OBJECTS) $(libwacomcfg_la_LIBADD) $(LIBS) + $(libwacomcfg_la_LINK) -rpath $(libdir) $(libwacomcfg_la_OBJECTS) $(libwacomcfg_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -370,13 +363,13 @@ done wacdump$(EXEEXT): $(wacdump_OBJECTS) $(wacdump_DEPENDENCIES) @rm -f wacdump$(EXEEXT) - $(LINK) $(wacdump_LDFLAGS) $(wacdump_OBJECTS) $(wacdump_LDADD) $(LIBS) + $(LINK) $(wacdump_OBJECTS) $(wacdump_LDADD) $(LIBS) xidump$(EXEEXT): $(xidump_OBJECTS) $(xidump_DEPENDENCIES) @rm -f xidump$(EXEEXT) - $(LINK) $(xidump_LDFLAGS) $(xidump_OBJECTS) $(xidump_LDADD) $(LIBS) + $(xidump_LINK) $(xidump_OBJECTS) $(xidump_LDADD) $(LIBS) xsetwacom$(EXEEXT): $(xsetwacom_OBJECTS) $(xsetwacom_DEPENDENCIES) @rm -f xsetwacom$(EXEEXT) - $(LINK) $(xsetwacom_LDFLAGS) $(xsetwacom_OBJECTS) $(xsetwacom_LDADD) $(LIBS) + $(LINK) $(xsetwacom_OBJECTS) $(xsetwacom_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -395,22 +388,22 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsetwacom.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -420,13 +413,9 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-wacomcfgHEADERS: $(wacomcfg_HEADERS) @$(NORMAL_INSTALL) - test -z "$(wacomcfgdir)" || $(mkdir_p) "$(DESTDIR)$(wacomcfgdir)" + test -z "$(wacomcfgdir)" || $(MKDIR_P) "$(DESTDIR)$(wacomcfgdir)" @list='$(wacomcfg_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -447,8 +436,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -460,8 +449,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -471,13 +460,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -491,22 +479,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -524,7 +511,7 @@ installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(wacomcfgdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -559,7 +546,7 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-am @@ -573,12 +560,20 @@ install-data-am: install-wacomcfgHEADERS +install-dvi: install-dvi-am + install-exec-am: install-binPROGRAMS install-libLTLIBRARIES +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -599,23 +594,26 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ - uninstall-libLTLIBRARIES uninstall-wacomcfgHEADERS +uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \ + uninstall-wacomcfgHEADERS + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic clean-libLTLIBRARIES clean-libtool ctags \ distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-exec install-exec-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-libLTLIBRARIES \ - install-man install-strip install-wacomcfgHEADERS installcheck \ - installcheck-am installdirs maintainer-clean \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip install-wacomcfgHEADERS \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-wacomcfgHEADERS + uninstall-libLTLIBRARIES uninstall-wacomcfgHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/util/wacdump.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/util/wacdump.c --- wacom-tools-0.7.9.3/linuxwacom/src/util/wacdump.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/util/wacdump.c 2008-02-29 18:58:44.000000000 -0500 @@ -36,6 +36,8 @@ ** ****************************************************************************/ +#include "../include/util-config.h" + #include "wactablet.h" #include "wacscrn.h" @@ -47,10 +49,6 @@ #include #include -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #define WACDUMP_VER "0.7.4" /* from linux/input.h */ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/util/wacomcfg.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/util/wacomcfg.c --- wacom-tools-0.7.9.3/linuxwacom/src/util/wacomcfg.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/util/wacomcfg.c 2008-02-29 18:58:44.000000000 -0500 @@ -29,15 +29,12 @@ ** ****************************************************************************/ +#include "../include/util-config.h" #include "wacomcfg.h" #include "../include/Xwacom.h" /* Hopefully it will be included in XFree86 someday, but * in the meantime, we are expecting it in the local * directory. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include /* debugging only, we've got no business output text */ #include #include @@ -137,7 +134,11 @@ for (i=0; inDevCnt; ++i) { info = hConfig->pDevs + i; +#ifndef WCM_ISXEXTENSIONPOINTER if (info->use != IsXExtensionDevice) continue; +#else + if (info->use != IsXExtensionDevice && info->use != IsXExtensionPointer) continue; +#endif if (!info->num_classes) continue; nSize += sizeof(WACOMDEVICEINFO); nSize += strlen(info->name) + 1; @@ -158,7 +159,11 @@ { info = hConfig->pDevs + i; /* ignore non-extension devices */ +#ifndef WCM_ISXEXTENSIONPOINTER if (info->use != IsXExtensionDevice) continue; +#else + if (info->use != IsXExtensionDevice && info->use != IsXExtensionPointer) continue; +#endif /* ignore uninitialized tools */ if (!info->num_classes) continue; /* copy name */ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/util/wacscrn.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/util/wacscrn.c --- wacom-tools-0.7.9.3/linuxwacom/src/util/wacscrn.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/util/wacscrn.c 2008-02-29 18:58:44.000000000 -0500 @@ -19,9 +19,7 @@ ** ****************************************************************************/ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "../include/util-config.h" #include #include diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/util/wactablet.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/util/wactablet.c --- wacom-tools-0.7.9.3/linuxwacom/src/util/wactablet.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/util/wactablet.c 2008-02-29 18:58:44.000000000 -0500 @@ -20,6 +20,8 @@ ** ****************************************************************************/ +#include "../include/util-config.h" + #include "wactablet.h" #include "wacserial.h" #include "wacusb.h" @@ -33,10 +35,6 @@ #include #include -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #ifdef WCM_ENABLE_LINUXINPUT #include #endif diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/util/wacusb.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/util/wacusb.c --- wacom-tools-0.7.9.3/linuxwacom/src/util/wacusb.c 2008-03-29 02:02:53.000000000 -0400 +++ wacom-tools-0.7.9.8/linuxwacom/src/util/wacusb.c 2008-03-29 02:02:53.000000000 -0400 @@ -2,7 +2,7 @@ ** wacusb.c ** ** Copyright (C) 2002 - 2004 - John E. Joganic -** Copyright (C) 2003 - 2007 - Ping Cheng +** Copyright (C) 2003 - 2008 - Ping Cheng ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License @@ -20,6 +20,8 @@ ** ****************************************************************************/ +#include "../include/util-config.h" + #include "wacusb.h" #include @@ -31,10 +33,6 @@ #include #include -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - /***************************************************************************** ** Begin USB Linux Input Subsystem *****************************************************************************/ @@ -255,12 +253,15 @@ { "CTF-420-U", "Wacom Volito2 4x5", 2, 0x62 }, { "CTF-220-U", "Wacom Volito2 2x3", 3, 0x63 }, { "CTF-421-U", "Wacom PenPartner2", 4, 0x64 }, + { "CTF_430-U", "Wacom Bamboo1", 5, 0x69 }, { NULL } }; static USBSUBTYPE xBamboo[] = { { "MTE_450", "Wacom Bamboo", 1, 0x65 }, + { "CTE_450", "Wacom BambooFun 4x5", 2, 0x17 }, + { "CTE_650", "Wacom BambooFun 6x8", 3, 0x18 }, { NULL } }; @@ -272,7 +273,9 @@ static USBSUBTYPE xCintiqV5[] = { - { "DTZ-21ux", "Wacom Cintiq 21UX", 1, 0x3F }, + { "DTZ-21ux", "Wacom Cintiq 21UX", 1, 0x3F }, + { "DTZ-20wsx", "Wacom Cintiq 20WSX", 2, 0x65 }, + { "DTZ-12wx", "Wacom Cintiq 12WX", 3, 0x6C }, { NULL } }; diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/util/wcmAction.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/util/wcmAction.c --- wacom-tools-0.7.9.3/linuxwacom/src/util/wcmAction.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/util/wcmAction.c 2008-02-29 18:58:44.000000000 -0500 @@ -1,7 +1,7 @@ /***************************************************************************** ** wcmAction.c ** -** Copyright (C) 2007 - Ping Cheng +** Copyright (C) 2007 - 2008 - Ping Cheng ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ ** ** REVISION HISTORY ** 2007-02-06 0.0.1-pc - Support keystrokes +** 2008-01-17 0.0.2-pc - Add Display Toggle */ /* This pseudo-header file is included both from the X11 driver, and from @@ -41,7 +42,8 @@ { "KEY", AC_KEY }, { "BUTTON", AC_BUTTON }, { "MODETOGGLE", AC_MODETOGGLE }, - { "DBLCLICK", AC_DBLCLICK } + { "DBLCLICK", AC_DBLCLICK }, + { "DISPLAYTOGGLE", AC_DISPLAYTOGGLE } }; static ACTIONCODE modifier_code [] = @@ -238,6 +240,7 @@ } case AC_MODETOGGLE: case AC_DBLCLICK: + case AC_DISPLAYTOGGLE: break; case AC_KEY: if (!strlen(ev_p)) diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/util/xidump.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/util/xidump.c --- wacom-tools-0.7.9.3/linuxwacom/src/util/xidump.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/util/xidump.c 2008-02-29 18:58:44.000000000 -0500 @@ -43,9 +43,7 @@ #define XIDUMP_VERSION "0.7.7" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "../include/util-config.h" /***************************************************************************** ** XInput diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/util/xsetwacom.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/util/xsetwacom.c --- wacom-tools-0.7.9.3/linuxwacom/src/util/xsetwacom.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/util/xsetwacom.c 2008-02-29 18:58:44.000000000 -0500 @@ -2,7 +2,7 @@ ** xsetwacom.c ** ** Copyright (C) 2003 - John E. Joganic -** Copyright (C) 2004-2007 - Ping Cheng +** Copyright (C) 2004-2008 - Ping Cheng ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU Lesser General Public License @@ -31,19 +31,18 @@ ** 2007-05-18 0.1.2 - PC - Support DebugLevel options ** 2007-06-05 0.1.3 - PC - Support Suppress and TwinView options ** 2007-07-24 0.1.4 - PC - Support Screen_No option +** 2008-01-17 0.1.5 - PC - Add DISPLAYTOGGLE command ** ****************************************************************************/ -#define XSETWACOM_VERSION "0.1.4" +#define XSETWACOM_VERSION "0.1.5" + +#include "../include/util-config.h" #include "wacomcfg.h" #include "../include/Xwacom.h" /* give us raw access to parameter values */ #include "wcmAction.h" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include #include #include @@ -697,7 +696,10 @@ "\tKEY: Emit a key event\n" "\tBUTTON: Emit a button event\n" "\tDBLCLICK: Emit a double-click button event\n" - "\tMODETOGGLE: Toggle absolute/relative tablet mode\n" + "\tMODETOGGLE: Toggle absolute/relative tablet mode\n"); + printf ("\tDISPLAYTOGGLE: Toggle cursor movement among screens\n" + "\t for the selected tool except pad which\n" + "\t applies to all tools asssociated with the tablet\n" " Modifier: use \"xsetwacom list mod\"\n" "\tto see a list of modifiers and specific keys\n" " CODE: Button number if emit a button event \n" @@ -991,7 +993,7 @@ static void DisplayValue (WACOMDEVICE *hDev, const char *devname, PARAMINFO *p, int disperr, int valu) { - int value, sl, i; + int value = 0, sl = 0, i = 0; char strval [200] = ""; unsigned keys[256]; if (WacomConfigGetRawParam (hDev, p->nParamID, &value, valu, keys)) @@ -1037,18 +1039,21 @@ sl += snprintf (strval + sl, sizeof (strval) - sl, "CORE "); switch (value & AC_TYPE) { - case AC_BUTTON: + case AC_BUTTON: sl += snprintf (strval + sl, sizeof (strval) - sl, "BUTTON "); break; - case AC_KEY: + case AC_KEY: sl += snprintf (strval + sl, sizeof (strval) - sl, "KEY "); break; - case AC_MODETOGGLE: + case AC_MODETOGGLE: sl += snprintf (strval + sl, sizeof (strval) - sl, "MODETOGGLE "); break; - case AC_DBLCLICK: + case AC_DBLCLICK: sl += snprintf (strval + sl, sizeof (strval) - sl, "DBLCLICK "); break; + case AC_DISPLAYTOGGLE: + sl += snprintf (strval + sl, sizeof (strval) - sl, "DISPLAYTOGGLE "); + break; } if ((value & AC_TYPE) != AC_KEY) { @@ -1119,7 +1124,8 @@ default: if ( ((value & AC_TYPE) != AC_KEY) && ((value & AC_TYPE) != AC_MODETOGGLE) && - ((value & AC_TYPE) != AC_DBLCLICK) ) + ((value & AC_TYPE) != AC_DBLCLICK) && + ((value & AC_TYPE) != AC_DISPLAYTOGGLE) ) printf ("%d\n", value); else printf ("%s\n", strval); diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/wacom.4x /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/wacom.4x --- wacom-tools-0.7.9.3/linuxwacom/src/wacom.4x 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/wacom.4x 2008-02-29 18:58:44.000000000 -0500 @@ -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.8" "X Version 11" +.TH WACOM 4x "linuxwacom 0.7.9" "X Version 11" .SH NAME wacom \- Wacom input driver .SH SYNOPSIS diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/wacomxi/Makefile.am /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/wacomxi/Makefile.am --- wacom-tools-0.7.9.3/linuxwacom/src/wacomxi/Makefile.am 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/wacomxi/Makefile.am 2008-02-29 18:58:44.000000000 -0500 @@ -2,10 +2,10 @@ # WacomXI Install if WACOMXI_INSTALL -tcllibdir = @WCM_WACOMXI_LIBDIR@/TkXInput +tcllibdir = $(libdir)/TkXInput tcllib_HEADERS = pkgIndex.tcl tcllib_LTLIBRARIES = libwacomxi.la -cpldir = @WCM_WACOMXI_BINDIR@ +cpldir = $(bindir) cpl_SCRIPTS = wacomcpl wacomcpl-exec endif diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/wacomxi/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/wacomxi/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/wacomxi/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/wacomxi/Makefile.in 2008-03-29 02:02:53.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,15 +16,11 @@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -42,12 +38,13 @@ DIST_COMMON = $(am__tcllib_HEADERS_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/wacomcpl.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/src/include/xdrv-config.h \ + $(top_builddir)/src/include/kernel-config.h \ + $(top_builddir)/src/include/util-config.h CONFIG_CLEAN_FILES = wacomcpl am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -62,20 +59,24 @@ libwacomxi_la_DEPENDENCIES = am_libwacomxi_la_OBJECTS = wacomxi.lo libwacomxi_la_OBJECTS = $(am_libwacomxi_la_OBJECTS) +libwacomxi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libwacomxi_la_LDFLAGS) $(LDFLAGS) -o $@ @WACOMXI_INSTALL_TRUE@am_libwacomxi_la_rpath = -rpath $(tcllibdir) cplSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(cpl_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(libwacomxi_la_SOURCES) DIST_SOURCES = $(libwacomxi_la_SOURCES) am__tcllib_HEADERS_DIST = pkgIndex.tcl @@ -85,8 +86,6 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -105,6 +104,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -114,6 +114,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -125,9 +126,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -144,51 +145,35 @@ STRIP = @STRIP@ TCLSH = @TCLSH@ VERSION = @VERSION@ -WACOMXI_INSTALL_FALSE = @WACOMXI_INSTALL_FALSE@ -WACOMXI_INSTALL_TRUE = @WACOMXI_INSTALL_TRUE@ WCM_ARCH = @WCM_ARCH@ -WCM_CFLAGS_STACK_PROTECTOR = @WCM_CFLAGS_STACK_PROTECTOR@ +WCM_CLEVEL = @WCM_CLEVEL@ WCM_DEPFLAGS = @WCM_DEPFLAGS@ -WCM_DLLOADER_FALSE = @WCM_DLLOADER_FALSE@ -WCM_DLLOADER_TRUE = @WCM_DLLOADER_TRUE@ -WCM_ENV_NCURSES_FALSE = @WCM_ENV_NCURSES_FALSE@ -WCM_ENV_NCURSES_TRUE = @WCM_ENV_NCURSES_TRUE@ -WCM_ENV_XF86_FALSE = @WCM_ENV_XF86_FALSE@ -WCM_ENV_XF86_TRUE = @WCM_ENV_XF86_TRUE@ -WCM_ENV_XORGSDK_FALSE = @WCM_ENV_XORGSDK_FALSE@ -WCM_ENV_XORGSDK_TRUE = @WCM_ENV_XORGSDK_TRUE@ -WCM_EXPMODULES = @WCM_EXPMODULES@ -WCM_EXPPROGS = @WCM_EXPPROGS@ -WCM_KERNELDIR = @WCM_KERNELDIR@ +WCM_KERNEL_DIR = @WCM_KERNEL_DIR@ WCM_KERNEL_VER = @WCM_KERNEL_VER@ WCM_KSTACK = @WCM_KSTACK@ WCM_LIBS = @WCM_LIBS@ WCM_LIBWACOMCFG_LIBS = @WCM_LIBWACOMCFG_LIBS@ WCM_LIBWACOMCFG_VER = @WCM_LIBWACOMCFG_VER@ -WCM_LINUXWACOMDIR = @WCM_LINUXWACOMDIR@ -WCM_LINUX_INPUT = @WCM_LINUX_INPUT@ WCM_MODDIR = @WCM_MODDIR@ WCM_MODULES = @WCM_MODULES@ WCM_MODVER = @WCM_MODVER@ WCM_NO_MERGE_CONSTANTS = @WCM_NO_MERGE_CONSTANTS@ +WCM_NO_STACK_PROTECTOR = @WCM_NO_STACK_PROTECTOR@ WCM_OPTION_EVDEV = @WCM_OPTION_EVDEV@ WCM_OPTION_HID = @WCM_OPTION_HID@ WCM_OPTION_INPUT = @WCM_OPTION_INPUT@ WCM_OPTION_MOUSEDEV = @WCM_OPTION_MOUSEDEV@ WCM_OPTION_USBMOUSE = @WCM_OPTION_USBMOUSE@ WCM_OPTION_WACOM = @WCM_OPTION_WACOM@ +WCM_PREFIX = @WCM_PREFIX@ WCM_PROGS = @WCM_PROGS@ WCM_TCLLIBS = @WCM_TCLLIBS@ WCM_TCLPKGS = @WCM_TCLPKGS@ -WCM_WACOMXI_BINDIR = @WCM_WACOMXI_BINDIR@ -WCM_WACOMXI_LIBDIR = @WCM_WACOMXI_LIBDIR@ WCM_WACOMXI_LIBS = @WCM_WACOMXI_LIBS@ -WCM_XF86DIR = @WCM_XF86DIR@ WCM_XF86MODULES = @WCM_XF86MODULES@ -WCM_XF86PROGS = @WCM_XF86PROGS@ +WCM_XFREE86_DIR = @WCM_XFREE86_DIR@ WCM_XIDUMP_LIBS = @WCM_XIDUMP_LIBS@ -WCM_XLIBDIR = @WCM_XLIBDIR@ -WCM_XORGSDK = @WCM_XORGSDK@ +WCM_XORGSDK_DIR = @WCM_XORGSDK_DIR@ WCM_XSERVER64 = @WCM_XSERVER64@ WCM_XSETWACOM_LIBS = @WCM_XSETWACOM_LIBS@ XMKMF = @XMKMF@ @@ -198,13 +183,15 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ +Xlib_CFLAGS = @Xlib_CFLAGS@ +Xlib_LIBS = @Xlib_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -216,6 +203,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -243,15 +231,18 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ AM_CFLAGS = -Wall # WacomXI Install -@WACOMXI_INSTALL_TRUE@tcllibdir = @WCM_WACOMXI_LIBDIR@/TkXInput +@WACOMXI_INSTALL_TRUE@tcllibdir = $(libdir)/TkXInput @WACOMXI_INSTALL_TRUE@tcllib_HEADERS = pkgIndex.tcl @WACOMXI_INSTALL_TRUE@tcllib_LTLIBRARIES = libwacomxi.la -@WACOMXI_INSTALL_TRUE@cpldir = @WCM_WACOMXI_BINDIR@ +@WACOMXI_INSTALL_TRUE@cpldir = $(bindir) @WACOMXI_INSTALL_TRUE@cpl_SCRIPTS = wacomcpl wacomcpl-exec EXTRA_DIST = wacomcpl-exec @@ -296,21 +287,21 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-tcllibLTLIBRARIES: $(tcllib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(tcllibdir)" || $(mkdir_p) "$(DESTDIR)$(tcllibdir)" + test -z "$(tcllibdir)" || $(MKDIR_P) "$(DESTDIR)$(tcllibdir)" @list='$(tcllib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(tcllibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(tcllibdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(tcllibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(tcllibdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(tcllibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(tcllibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(tcllibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(tcllibdir)/$$f"; \ else :; fi; \ done uninstall-tcllibLTLIBRARIES: @$(NORMAL_UNINSTALL) - @set -x; list='$(tcllib_LTLIBRARIES)'; for p in $$list; do \ + @list='$(tcllib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(tcllibdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(tcllibdir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(tcllibdir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(tcllibdir)/$$p"; \ done clean-tcllibLTLIBRARIES: @@ -322,10 +313,10 @@ rm -f "$${dir}/so_locations"; \ done libwacomxi.la: $(libwacomxi_la_OBJECTS) $(libwacomxi_la_DEPENDENCIES) - $(LINK) $(am_libwacomxi_la_rpath) $(libwacomxi_la_LDFLAGS) $(libwacomxi_la_OBJECTS) $(libwacomxi_la_LIBADD) $(LIBS) + $(libwacomxi_la_LINK) $(am_libwacomxi_la_rpath) $(libwacomxi_la_OBJECTS) $(libwacomxi_la_LIBADD) $(LIBS) install-cplSCRIPTS: $(cpl_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(cpldir)" || $(mkdir_p) "$(DESTDIR)$(cpldir)" + test -z "$(cpldir)" || $(MKDIR_P) "$(DESTDIR)$(cpldir)" @list='$(cpl_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -352,22 +343,22 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wacomxi.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -377,13 +368,9 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-tcllibHEADERS: $(tcllib_HEADERS) @$(NORMAL_INSTALL) - test -z "$(tcllibdir)" || $(mkdir_p) "$(DESTDIR)$(tcllibdir)" + test -z "$(tcllibdir)" || $(MKDIR_P) "$(DESTDIR)$(tcllibdir)" @list='$(tcllib_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -404,8 +391,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -417,8 +404,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -428,13 +415,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -448,22 +434,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -479,7 +464,7 @@ all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(tcllibdir)" "$(DESTDIR)$(cpldir)" "$(DESTDIR)$(tcllibdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -514,7 +499,7 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-am @@ -529,12 +514,20 @@ install-data-am: install-cplSCRIPTS install-tcllibHEADERS \ install-tcllibLTLIBRARIES +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -555,22 +548,25 @@ ps-am: -uninstall-am: uninstall-cplSCRIPTS uninstall-info-am \ - uninstall-tcllibHEADERS uninstall-tcllibLTLIBRARIES +uninstall-am: uninstall-cplSCRIPTS uninstall-tcllibHEADERS \ + uninstall-tcllibLTLIBRARIES + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-tcllibLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-cplSCRIPTS install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip \ - install-tcllibHEADERS install-tcllibLTLIBRARIES installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-cplSCRIPTS \ - uninstall-info-am uninstall-tcllibHEADERS \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip install-tcllibHEADERS \ + install-tcllibLTLIBRARIES installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-cplSCRIPTS uninstall-tcllibHEADERS \ uninstall-tcllibLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/wacomxi/wacomcpl-exec /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/wacomxi/wacomcpl-exec --- wacom-tools-0.7.9.3/linuxwacom/src/wacomxi/wacomcpl-exec 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/wacomxi/wacomcpl-exec 2008-02-29 18:58:44.000000000 -0500 @@ -52,7 +52,8 @@ set modeToggleB 33 set ignoreButton 34 set doubleClickB 35 -set keystrokeB 36 +set displayToggleB 36 +set keystrokeB 37 proc updateCurrentScreenInfo {} { @@ -308,10 +309,10 @@ } proc disableButtons {} { - global bName numButton currentW currentb + global bName numButton numStrips currentW currentb if { $currentb } { - for { set i 1 } { $i <= $numButton } { incr i 1 } { + for { set i 1 } { $i <= [ expr ($numButton+$numStrips) ] } { incr i 1 } { .allothers.f.$i configure -state disabled } .allothers.f.ok configure -state disable @@ -337,8 +338,8 @@ } proc getDeviceOptionProc { dev i } { - global getOption getOptionDefault Option oldKeys spName numButton - global modeToggleB ignoreButton doubleClickB keystrokeB + global getOption getOptionDefault Option oldKeys spName numButton modeToggleB + global displayToggleB ignoreButton doubleClickB keystrokeB numStrips for { set j 1 } { $j < [ expr $i+1 ] } { incr j 1 } { set value [ exec xsetwacom get $dev $Option($j) ] @@ -369,44 +370,45 @@ } } else { set match 0 - # are they wheel/ring/strips? - for { set k 1 } { $k <= 8 } { incr k 1 } { + # are they button/wheel/ring/strip? + for { set k 1 } { $k <= [ expr ($numButton+$numStrips) ] } { incr k 1 } { if { ![string compare -nocase $Option($j) $spName($k)] } { - set k 9 set match 1 + break } } + set getOption($dev,$Option($j)) $value + set getOptionDefault($dev,$Option($j)) $value1 if { $match } { if { ($value > $doubleClickB) || ($value == 0) } { - set output [ exec xsetwacom get $dev $Option($j) ] - set outputd [ lindex $output 0 ] - if { ![string compare -nocase -length 8 DBLCLICK $outputd ] } { + if { ![string compare -nocase -length 8 DBLCLICK $value ] } { set getOption($dev,$Option($j)) $doubleClickB } - if { ![string compare -nocase -length 4 "Core" $outputd ] } { + if { ![string compare -nocase -length 4 CORE $value ] } { set getOption($dev,$Option($j)) $keystrokeB - set oldKeys($Option($j)) $output + set oldKeys($Option($j)) $value + } + if { ![string compare -nocase -length 10 MODETOGGLE $value ] } { + set getOption($dev,$Option($j)) $modeToggleB } - if { ![string compare -nocase -length 10 MODETOGGLE $outputd ] } { - set getOption($dev,$Option($j)) $modetoggleB + if { ![string compare -nocase -length 13 DISPLAYTOGGLE $value ] } { + set getOption($dev,$Option($j)) $displayToggleB } - if { ($value == 0) } { + if { $value == 0 } { set getOption($dev,$Option($j)) $ignoreButton } - } else { - set getOption($dev,$Option($j)) $value } - } else { - set getOption($dev,$Option($j)) $value + if { $value == 0 } { + set getOptionDefault($dev,$Option($j)) $ignoreButton + } } - set getOptionDefault($dev,$Option($j)) $value1 } } } proc updateDevice {} { - global device deviceIndex getOption hasPad isLCD - global numScreens getDeviceModel Option + global device deviceIndex hasPad isLCD + global numScreens getDeviceModel set olddev $device set device [ .workingDev.list get anchor ] @@ -426,9 +428,6 @@ .workingDev.label configure -text $device set model $getDeviceModel($device,model) set type $getDeviceModel($device,type) - set Option(1) "Mode" - getDeviceOptionProc $device 1 - set mode $getOption($device,Mode) destroy .panel if { ![ string compare $type "pad" ] } { if { $hasPad($model) } { @@ -471,11 +470,13 @@ while { $dev != "" } { set index [ expr $index+1 ] set type [ lindex $infoString $index ] - set index [ expr $index+1 ] - set getDeviceModel($dev,type) $type - set getDeviceModel($dev,model) [ exec xsetwacom get $dev TabletID ] - set devices "$devices $dev" + if { [catch { exec xsetwacom get $dev TabletID } model] == 0} { + set getDeviceModel($dev,type) $type + set getDeviceModel($dev,model) $model + set devices "$devices $dev" + set index [ expr $index+1 ] + } set dev [ lindex $infoString $index ] } @@ -563,13 +564,18 @@ proc updateButton {} { global device getDeviceModel sm getOption spName isLCD - global dm currentW oldKeys numButton cKeys numStrips - global modeToggleB ignoreButton doubleClickB keystrokeB + global dm currentW oldKeys numButton cKeys numStrips startS + global modeToggleB ignoreButton doubleClickB keystrokeB + global displayToggleB set type $getDeviceModel($device,type) set model $getDeviceModel($device,model) for { set i 1 } { $i <= [ expr ($numButton + $numStrips)] } { incr i 1 } { + set k $i + if { $i > $numButton } { + set k [ expr ($startS-1+$i) ] + } switch [ $currentW.f.$i cget -text ] { "Left" { set j 1 @@ -592,25 +598,28 @@ "Mode Toggle" { set j $modeToggleB set v "ModeToggle 1" } + "Display Toggle" + { set j $displayToggleB + set v "DisplayToggle 1" } "KeyStroke" { set j $keystrokeB - set v $cKeys($spName($i)) - set oldKeys($spName($i)) $cKeys($spName($i)) } + set v $cKeys($spName($k)) + set oldKeys($spName($k)) $cKeys($spName($k)) } "Ignore" { set j $ignoreButton set v "Button 0" } } - set getOption($device,$spName($i)) $j - updateXinitrc $device $spName($i) $v + set getOption($device,$spName($k)) $j + updateXinitrc $device $spName($k) $v # reset key strokes if { $j != $keystrokeB } { - set $oldKeys($spName($i)) "" - set cKeys($spName($i)) "" + set $oldKeys($spName($k)) "" + set cKeys($spName($k)) "" } } - if { !isLCD($model) && [string compare $type "pad"] } { + if { !$isLCD($model) && [string compare $type "pad"] } { set mode [ $currentW.f.mode cget -text ] updateXinitrc $device mode $mode if { $mode == $dm(1) } { @@ -635,18 +644,24 @@ proc defaultButton {} { global db db1 db2 db3 db4 db5 db6 db7 db8 db9 db10 - global db11 db12 db13 db14 isLCD - global dm sm dmv smv numButton + global db11 db12 db13 db14 isLCD spName + global dm sm dmv smv numButton startS numStrips global device getOptionDefault getDeviceModel for { set i 1 } { $i <= $numButton } { incr i 1 } { - set db$i $db($i) + set db$i $db($getOptionDefault($device,$spName($i))) + } + + if { $startS } { + for { set i $startS } { $i <= [ expr ($startS+$numStrips-1) ] } { incr i 1 } { + set db$i $db($getOptionDefault($device,$spName([ expr ($numButton+$i) ]))) + } } set model $getDeviceModel($device,model) set type $getDeviceModel($device,type) - if { !$isLCD($model) } { + if { !$isLCD($model) && [ string compare $type "pad" ] } { set dmv $dm([ expr $getOptionDefault($device,Mode)+1 ]) } @@ -681,11 +696,13 @@ } proc setspName {} { - global numButton spName + global numButton spName numStrips startS device Option cKeys oldKeys + global numPadRelW numPadStrips numPadRings getDeviceModel for { set i 1 } { $i <= $numButton } { incr i 1 } { set spName($i) Button$i } + getDeviceOptionProc $device $numButton set spName([expr ($numButton + 1) ]) "RelWUp" set spName([expr ($numButton + 2) ]) "RelWDn" @@ -695,18 +712,42 @@ set spName([expr ($numButton + 6) ]) "StripLDn" set spName([expr ($numButton + 7) ]) "StripRUp" set spName([expr ($numButton + 8) ]) "StripRDn" + + for { set i 1 } { $i <= 8 } { incr i 1 } { + set Option($i) $spName([expr ($numButton + $i)]) + } + getDeviceOptionProc $device 8 + + set s1 5 + set s2 8 + set model $getDeviceModel($device,model) + if { $numPadRelW($model) } { # G4 + set s1 1 + set s2 2 + } elseif { $numPadStrips($model) == 1 } { # I3 4x5 + set s1 5 + set s2 6 + } elseif { $numPadRings($model) } { # Bamboo + set s1 3 + set s2 4 + } + set startS $s1 + set numStrips [expr ($s2 - $s1) + 1] + + # initial keys + for { set i 1 } { $i <= [ expr ($numButton + 8) ] } { incr i 1 } { + set oldKeys($spName($i)) "" + set cKeys($spName($i)) "" + } } proc initialButton {} { - global device Option numButton getDeviceModel spName numStrips + global device Option numButton getDeviceModel + global spName numStrips set type $getDeviceModel($device,type) - # buttons - getNumButton $type set t $numButton - setspName - if { [ string compare $type "pad" ] } { set t [expr ($t+1)] set Option($t) "Mode" @@ -714,7 +755,9 @@ set Option($t) "TPCButton" } getDeviceOptionProc $device $t - displayMode + if { [ string compare $type "pad" ] } { + displayMode + } for { set i 1 } { $i <= $numButton } { incr i 1 } { addMenu $i @@ -730,17 +773,12 @@ proc displayMode {} { global device getDeviceModel sm smv - global dmv dm getOption currentW + global dmv dm getOption currentW isLCD set model $getDeviceModel($device,model) set type $getDeviceModel($device,type) - if { ( !(($model >= 48 && $model < 64) \ - || ($model >= 192 && $model < 196) \ - || ($model == 63) \ - || ($model == 144) \ - || ($model == 198)) ) \ - && [ string compare $type "pad" ] } { + if { !$isLCD($model) && [ string compare $type "pad" ] } { set dmv $dm([ expr $getOption($device,Mode)+1 ]) tk_optionMenu $currentW.f.mode dmv $dm(1) $dm(2) label $currentW.f.modeL -text "Positioning Mode: " @@ -757,18 +795,18 @@ } } -proc displaySubWindow { okF deF initial winID cbutton } { - global currentb currentW wName +proc displaySubWindow { okF deF initial winID cbutton kcurrent} { + global currentb currentW wName currentk set currentb $cbutton - + set currentk $kcurrent if { $cbutton } { set currentW .keystrokes } else { set currentW .allothers } toplevel $currentW - wm geometry $currentW =650x300 + wm geometry $currentW =650x425 wm title $currentW $wName($winID) wm transient $currentW . wm state $currentW normal @@ -808,13 +846,12 @@ if { $bName(keystroke) } { set bName(keystroke) 0 set currentW .allothers - for { set i 1 } { $i <= $numButton } { incr i 1 } { + for { set i 1 } { $i <= [ expr ($numButton+$numStrips) ] } { incr i 1 } { $currentW.f.$i configure -state normal } $currentW.f.default configure -state normal $currentW.f.ok configure -state normal $currentW.f.cancel configure -state normal - set cKeys($spName($currentb)) "" set currentb 0 } else { if { $bName(pressure) } { @@ -832,7 +869,7 @@ if { $bName(advanced) } { .panel.advanced configure -state normal } - for { set i 1 } { $i <= [expr ($numButton + $numStrips)] } { incr i 1 } { + for { set i 1 } { $i <= [ expr ($numButton+$numStrips) ] } { incr i 1 } { set cKeys($spName($i)) "" } bindtags .workingDev.list $workingTags @@ -841,16 +878,12 @@ proc expressKeys { } { global db db1 db2 db3 db4 db5 db6 db7 db8 db9 db10 - global db11 db12 db13 db14 + global db11 db12 db13 db14 startS global currentW device numButton spName numStrips global Option getOption getDeviceModel cKeys oldKeys - global doubleClickB ignoreButton modeToggleB keystrokeB + global displayToggleB ignoreButton keystrokeB global numPadRings numPadStrips numPadAbsW numPadRelW - for { set i 1 } { $i <= 8 } { incr i 1 } { - set Option($i) $spName([expr ($numButton + $i)]) - } - set name(1) "Wheel Up" set name(2) "Wheel Down" set name(3) "Ring Clockwise" @@ -860,55 +893,38 @@ set name(7) "Right Strip Up" set name(8) "Right Strip Down" - getDeviceOptionProc $device 8 - - set s1 5 - set s2 8 - set model $getDeviceModel($device,model) - if { $numPadRelW($model) } { # G4 - set s1 1 - set s2 2 - } elseif { $numPadStrips($model) == 1 } { # I3 4x5 - set s1 5 - set s2 6 - } elseif { $numPadRings($model) } { # Bamboo - set s1 3 - set s2 4 - } - set numStrips [expr ($s2 - $s1) + 1] - for { set i $s1 } { $i <= $s2 } { incr i 1 } { - set cur [ expr ($numButton + $i - $s1 + 1) ] + set s2 [expr ($startS + $numStrips) - 1] + for { set i $startS } { $i <= $s2 } { incr i 1 } { + set cur [ expr ($numButton + $i - $startS + 1) ] set opt $getOption($device,$Option($i)) if { $opt == "" } { set opt $ignoreButton } - set cur [ expr ($numButton + $i - $s1 + 1) ] + set curOption [ expr ($numButton + $i) ] set db$cur $db($opt) - #reset keys if { $opt != $keystrokeB } { set cKeys($Option($i)) "" set oldKeys($Option($i)) "" } - set bmenu [ tk_optionMenu $currentW.f.$cur db$cur \ - $db(1) $db(2) $db(3) $db(4) $db(5) ] - $bmenu insert 6 radiobutton -label "$db($keystrokeB)" \ + set bmenu [ tk_optionMenu $currentW.f.$cur db$cur $db(1) $db(2) \ + $db(3) $db(4) $db(5) $db($displayToggleB) $db($ignoreButton) ] + $bmenu insert 8 radiobutton -label "$db($keystrokeB)" \ -variable menvar -command "displaySubWindow \ - updateKeys 0 initialKeys 5 $cur" - $bmenu insert 7 radiobutton -label "$db($ignoreButton)" + updateKeys 0 initialKeys 5 $cur $curOption" label $currentW.f.name$cur -text "$name($i): " set t2 [expr ($numButton+1)/2+1] set t1 0 - if { [expr ($s2 - $s1) > 1] } { - if { $i == [expr ($s1+1)] || \ - $i == [expr ($s1+3)] } { + if { [expr ($s2 - $startS) > 1] } { + if { $i == [expr ($startS+1)] || \ + $i == [expr ($startS+3)] } { set t2 [expr ($numButton+1)/2+2] } - if { [expr ($i - $s1) > 1] } { + if { [expr ($i - $startS) > 1] } { set t1 2 } } else { - if { [expr ($i - $s1) > 0] } { + if { [expr ($i - $startS) > 0] } { set t1 2 } } @@ -921,7 +937,7 @@ global db db1 db2 db3 db4 db5 db6 db7 db8 db9 db10 global db11 db12 db13 db14 currentW global getOption getDeviceModel cKeys oldKeys device spName - global doubleClickB ignoreButton modeToggleB keystrokeB + global doubleClickB displayToggleB ignoreButton modeToggleB keystrokeB set model $getDeviceModel($device,model) set type $getDeviceModel($device,type) @@ -929,10 +945,9 @@ set opt $getOption($device,$spName($curb)) if { $opt == "" } { set opt $curb } if { ![string compare $type "pad"] } { - if { ($opt > 8 && $opt < 14) } { + # values 30 or larger are special functions + if { ($opt > 8 && $opt < 30) } { set opt [ expr ($opt-8) ] - } else { - set opt $ignoreButton } } set db$curb $db($opt) @@ -942,24 +957,21 @@ set oldKeys($spName($curb)) "" } - - set bmenu [ tk_optionMenu $currentW.f.$curb db$curb $db(1) $db(2) \ - $db(3) $db(4) $db(5) ] - set i 5 if { [string compare $type "pad"] } { - set i [expr ($i+1)] - $bmenu insert $i radiobutton -label "$db($doubleClickB)" - if { $model != 144 } { - set i [expr ($i+1)] - $bmenu insert $i radiobutton -label "$db($modeToggleB)" - } - } + set bmenu [ tk_optionMenu $currentW.f.$curb db$curb $db(1) $db(2) \ + $db(3) $db(4) $db(5) $db($doubleClickB) $db($modeToggleB) \ + $db($displayToggleB) $db($ignoreButton) ] + set i 9 + } else { + set bmenu [ tk_optionMenu $currentW.f.$curb db$curb $db(1) $db(2) \ + $db(3) $db(4) $db(5) $db($displayToggleB) $db($ignoreButton) ] + set i 7 + } + set i [expr ($i+1)] $bmenu insert $i radiobutton -label "$db($keystrokeB)" \ -variable menvar -command "displaySubWindow \ - updateKeys 0 initialKeys 5 $curb" - set i [expr ($i+1)] - $bmenu insert $i radiobutton -label "$db($ignoreButton)" + updateKeys 0 initialKeys 5 $curb $curb" label $currentW.f.name$curb -text "Button $curb: " set t2 [expr ($curb-1)/2] @@ -1075,7 +1087,9 @@ set Option(1) "PressCurve" set Option(2) "ClickForce" - getDeviceOptionProc $device 2 + set Option(3) "RawSample" + set Option(4) "Suppress" + getDeviceOptionProc $device 4 frame $currentW.f.group -bd 10 -bg beige -width 150 -height 150 label $currentW.f.group.groupl1 -text "Tip Sensitivity: " @@ -1102,6 +1116,28 @@ grid $currentW.f.group.scale2 -row 3 -column 8 $currentW.f.group.scale2 set $getOption($device,ClickForce) + label $currentW.f.group.groupl3 -text "Smoothness: " + grid $currentW.f.group.groupl3 -row 5 -column 0 + label $currentW.f.group.l6 -text "Low" + grid $currentW.f.group.l6 -row 6 -column 7 + label $currentW.f.group.l7 -text "High" + grid $currentW.f.group.l7 -row 6 -column 9 + scale $currentW.f.group.scale3 -orient horizontal -length 100 \ + -from 1 -to 20 + grid $currentW.f.group.scale3 -row 5 -column 8 + $currentW.f.group.scale3 set $getOption($device,RawSample) + + label $currentW.f.group.groupl4 -text "Suppress Points: " + grid $currentW.f.group.groupl4 -row 7 -column 0 + label $currentW.f.group.l8 -text "Low" + grid $currentW.f.group.l8 -row 8 -column 7 + label $currentW.f.group.l9 -text "High" + grid $currentW.f.group.l9 -row 8 -column 9 + scale $currentW.f.group.scale4 -orient horizontal -length 100 \ + -from 1 -to 20 + grid $currentW.f.group.scale4 -row 7 -column 8 + $currentW.f.group.scale4 set $getOption($device,Suppress) + grid $currentW.f.group -row 0 -column 5 } @@ -1128,6 +1164,11 @@ set getOption($device,PressCurve) $curve updateXinitrc $device ClickForce [ $currentW.f.group.scale2 get ] set getOption($device,ClickForce) [ $currentW.f.group.scale2 get ] + updateXinitrc $device RawSample [ $currentW.f.group.scale3 get ] + set getOption($device,RawSample) [ $currentW.f.group.scale3 get ] + updateXinitrc $device Suppress [ $currentW.f.group.scale4 get ] + set getOption($device,Suppress) [ $currentW.f.group.scale4 get ] + closeSubWindow } @@ -1251,18 +1292,17 @@ proc initialKeys {} { global device getDeviceModel getOption cKeys spName - global Option oldKeys currentW bName currentb + global Option oldKeys currentW bName currentb currentk frame $currentW.f.panelt set bName(keystroke) 1 text $currentW.f.panelt.input -width 40 -height 10 \ -yscrollcommand "$currentW.f.panelt.srl_y set" - - if { $cKeys($spName($currentb)) != "" } { - $currentW.f.panelt.input insert end $cKeys($spName($currentb)) + if { $cKeys($spName($currentk)) != "" } { + $currentW.f.panelt.input insert end $cKeys($spName($currentk)) } else { - if { $oldKeys($spName($currentb)) != "" } { - $currentW.f.panelt.input insert end $oldKeys($spName($currentb)) + if { $oldKeys($spName($currentk)) != "" } { + $currentW.f.panelt.input insert end $oldKeys($spName($currentk)) } } scrollbar $currentW.f.panelt.srl_y -width 10 -command \ @@ -1375,8 +1415,8 @@ proc updateKeys {} { global device oldKeys currentb cKeys spName currentW global db db1 db2 db3 db4 db5 db6 db7 db8 db9 db10 - global db11 db12 db13 db14 - global doubleClickB ignoreButton modeToggleB keystrokeB + global db11 db12 db13 db14 currentk + global ignoreButton keystrokeB set keys [ $currentW.f.panelt.input get 1.0 end ] @@ -1388,20 +1428,20 @@ } if { $keys != "" } { - if { $oldKeys($spName($currentb)) != $keys } { + if { $oldKeys($spName($currentk)) != $keys } { if { [string compare -nocase -length 8 $keys "core key"] } { - set cKeys($spName($currentb)) "core key $keys" + set cKeys($spName($currentk)) "core key $keys" } else { - set cKeys($spName($currentb)) $keys + set cKeys($spName($currentk)) $keys } - set getOption($device,$spName($currentb)) $keystrokeB - set db$currentb $db($keystroke) + set getOption($device,$spName($currentk)) $keystrokeB + set db$currentb $db($keystrokeB) } } else { # ignore the button - set getOption($device,$spName($currentb)) $ignoreButton + set getOption($device,$spName($currentk)) $ignoreButton set db$currentb $db($ignoreButton) } - if { [ string length $cKeys($spName($currentb)) ] > 240 } { + if { [ string length $cKeys($spName($currentk)) ] > 240 } { helpWindow "Help Window " \ "\n\nYou have entered more 240 keys. \n\ wacomcpl only accepts 240 keys. \n\ @@ -1412,7 +1452,8 @@ } proc createPanel { pressure button mapping calibrate } { - global bName device getOption getDeviceModel currentb wName + global bName device getOption getDeviceModel currentb + global wName startS Option frame .panel set bName(pressure) $pressure @@ -1420,9 +1461,14 @@ set bName(mapping) $mapping set bName(calibrate) $calibrate set currentb 0 + set type $getDeviceModel($device,type) + + # buttons and expresskeys + getNumButton $type + setspName set SN [ exec xsetwacom get $device ToolSerial ] - if { $SN && [string compare $getDeviceModel($device,type) "pad"] } { + if { $SN && [string compare type "pad"] } { set hexSN [format %X $SN] label .panel.sn -text "Serial Number: $hexSN" grid .panel.sn -row 0 -column 0 -columnspan 2 -padx 3 -pady 3 @@ -1431,25 +1477,25 @@ if { $pressure } { button .panel.pressure -text $wName(1) \ -state normal -command "displaySubWindow \ - updateTip defaultTip initialTip 1 0" + updateTip defaultTip initialTip 1 0 0" grid .panel.pressure -row 5 -column 0 -columnspan 2 -sticky news -padx 10 } if { $button } { if { ![string compare $getDeviceModel($device,type) "pad"] } { button .panel.button -text $wName(6) \ -state normal -command "displaySubWindow \ - updateButton defaultButton initialButton 6 0" + updateButton defaultButton initialButton 6 0 $startS" } else { button .panel.button -text $wName(2) \ -state normal -command "displaySubWindow \ - updateButton defaultButton initialButton 2 0" + updateButton defaultButton initialButton 2 0 0" } grid .panel.button -row 6 -column 0 -columnspan 2 -sticky news -padx 10 } if { $mapping } { button .panel.mapping -text $wName(3) \ -state normal -command "displaySubWindow \ - updateT defaultT initialT 3 0" + updateT defaultT initialT 3 0 0" grid .panel.mapping -row 6 -column 3 -columnspan 2 -sticky news -padx 10 } if { $calibrate } { @@ -1458,15 +1504,18 @@ grid .panel.calibrate -row 5 -column 3 -columnspan 2 -sticky news -padx 10 } - set mode [ exec xsetwacom get $device mode ] - set getOption($device,Mode) $mode set bName(advanced) 0 - if { ($pressure || $mapping) && $mode } { #not a pad and in absolute mode - set bName(advanced) 1 - button .panel.advanced -text $wName(4) \ - -state normal -command "displaySubWindow \ - updateSet defaultSet initialSet 4 0" - grid .panel.advanced -row 9 -column 2 -columnspan 2 -sticky news -padx 10 + if { [string compare $getDeviceModel($device,type) "pad"] } { #not a pad + set Option(1) "Mode" + getDeviceOptionProc $device 1 + set mode $getOption($device,Mode) + if { ($pressure || $mapping) && $mode } { #and in absolute mode + set bName(advanced) 1 + button .panel.advanced -text $wName(4) \ + -state normal -command "displaySubWindow \ + updateSet defaultSet initialSet 4 0 0" + grid .panel.advanced -row 9 -column 2 -columnspan 2 -sticky news -padx 10 + } } grid .panel -row 0 -column 1 -columnspan 8 -sticky news -padx 10 -pady 40 @@ -1518,11 +1567,18 @@ # I3 set numPadButtons(176) 4 set numPadStrips(176) 1 - for { set i 177 } { $i <= 183 } { incr i 1 } { + for { set i 177 } { $i <= 182 } { incr i 1 } { set numPadButtons($i) 8 set numPadStrips($i) 2 } - # Hummingbird + set numPadButtons(183) 4 + set numPadStrips(183) 1 + + # Cintiq 20WSX + set numPadButtons(197) 10 + set numPadStrips(197) 2 + + # Hummingbird (Cintiq 12WX) set numPadButtons(198) 10 set numPadStrips(198) 2 @@ -1541,7 +1597,8 @@ global numScreens currentScreen cKeys spName global desktopHeight desktopWidth oldKeys numStrips global workingTags db dm sm wName bName numButton - global doubleClickB ignoreButton modeToggleB keystrokeB + global doubleClickB ignoreButton displayToggleB + global modeToggleB keystrokeB createDeviceList updateModelInfo @@ -1551,8 +1608,14 @@ set db(3) "Right" set db(4) "Fourth" set db(5) "Fifth" + set db(6) "Ignore" + set db(7) "Ignore" + set db(8) "Ignore" + set db(9) "Ignore" + set db(10) "Ignore" set db($doubleClickB) "Left Double" set db($modeToggleB) "Mode Toggle" + set db($displayToggleB) "Display Toggle" set db($ignoreButton) "Ignore" set db($keystrokeB) "KeyStroke" set dm(1) "Relative" @@ -1572,12 +1635,7 @@ # up to the max number of buttons set numButton 10 set numStrips 4 - setspName - - for { set i 1 } { $i <= [ expr ($numButton + 8) ] } { incr i 1 } { - set oldKeys($spName($i)) "" - set cKeys($spName($i)) "" - } +# setspName checkbutton .showHelp -text "Turn Help on" -anchor w \ -variable showHelp -state normal diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/wacomxi/wacomcpl.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/wacomxi/wacomcpl.in --- wacom-tools-0.7.9.3/linuxwacom/src/wacomxi/wacomcpl.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/wacomxi/wacomcpl.in 2008-02-29 18:58:44.000000000 -0500 @@ -13,8 +13,8 @@ # (eg. [list [list foo] bar]) and it seems to work as expected. # Trailing space seems to be necessary. # -WACOMXI_BINDIR=@WCM_WACOMXI_BINDIR@ -WACOMXI_LIBDIR=@WCM_WACOMXI_LIBDIR@ +WACOMXI_BINDIR=@WCM_PREFIX@/bin +WACOMXI_LIBDIR=@WCM_PREFIX@/lib export TCLLIBPATH="[list $TCLLIBPATH $WACOMXI_LIBDIR ]" echo "wacomcpl: using TCLLIBPATH=\"$TCLLIBPATH\"" $WACOMXI_BINDIR/wacomcpl-exec diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/xdrv/Makefile.am /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/xdrv/Makefile.am --- wacom-tools-0.7.9.3/linuxwacom/src/xdrv/Makefile.am 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/xdrv/Makefile.am 2008-03-29 02:02:53.000000000 -0400 @@ -3,8 +3,7 @@ x86moduledir = @WCM_MODDIR@ x86module_DATA = @WCM_XF86MODULES@ -AM_CFLAGS = -Wall -pedantic -DEPFLAGS = @WCM_DEPFLAGS@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include # These identify which programs, libraries, and headers could # potentially be built or installed depending on the results of @@ -17,76 +16,55 @@ wcmFilter.c wcmFilter.h wcmSerial.h \ ../include/Xwacom.h -KERNEL_DIR =@WCM_KERNELDIR@ -XF86_DIR =@WCM_XF86DIR@ -XORGSDK_DIR =@WCM_XORGSDK@ -DEBUG_FLAGS = -D__JEJ_DEBUG -ARCHITECTURE =@WCM_ARCH@ -XSERVER64 =@WCM_XSERVER64@ - if WCM_ENV_XORGSDK -DRIVER_INCLUDES = -I$(XORGSDK_DIR) $(X_CFLAGS) -DWCM_XORG +DRIVER_INCLUDES = -I$(WCM_XORGSDK_DIR) $(X_CFLAGS) endif -if WCM_ENV_XF86 +if WCM_ENV_XFREE86 DRIVER_INCLUDES = \ - -I$(XF86_DIR)/programs/Xserver/hw/xfree86/common \ - -I$(XF86_DIR)/programs/Xserver/hw/xfree86/loader \ - -I$(XF86_DIR)/programs/Xserver/hw/xfree86/os-support \ - -I$(XF86_DIR)/programs/Xserver/include \ - -I$(XF86_DIR)/programs/Xserver/mi \ - -I$(XF86_DIR)/exports/include/X11 \ - -I$(XF86_DIR)/include/extensions \ - -I$(XF86_DIR) \ - -I$(XF86_DIR)/exports/include -DWCM_XFREE86 + -I$(WCM_XFREE86_DIR)/programs/Xserver/hw/xfree86/common \ + -I$(WCM_XFREE86_DIR)/programs/Xserver/hw/xfree86/loader \ + -I$(WCM_XFREE86_DIR)/programs/Xserver/hw/xfree86/os-support \ + -I$(WCM_XFREE86_DIR)/programs/Xserver/include \ + -I$(WCM_XFREE86_DIR)/programs/Xserver/mi \ + -I$(WCM_XFREE86_DIR)/exports/include/X11 \ + -I$(WCM_XFREE86_DIR)/include/extensions \ + -I$(WCM_XFREE86_DIR) \ + -I$(WCM_XFREE86_DIR)/exports/include endif NO_MERGE_CONSTANTS=@WCM_NO_MERGE_CONSTANTS@ - -LINUX_INPUT=@WCM_LINUX_INPUT@ +NO_STACK_PROTECTOR=@WCM_NO_STACK_PROTECTOR@ +WCM_CLEVEL=@WCM_CLEVEL@ if WCM_DLLOADER DLLOADER=-fPIC endif -CFLAGS += $(WCM_CFLAGS_STACK_PROTECTOR) - XF86OBJS = xf86Wacom.o wcmSerial.o wcmUSB.o wcmISDV4.o \ wcmXCommand.o wcmCommon.o wcmCompat.o wcmConfig.o \ wcmFilter.o -xf86Wacom.o: xf86Wacom.c wcmFilter.h ../include/Xwacom.h -wcmXCommand.o: wcmXCommand.c wcmFilter.h ../include/Xwacom.h -wcmSerial.o: wcmSerial.c wcmSerial.h wcmFilter.h -wcmISDV4.o: wcmISDV4.c wcmSerial.h wcmFilter.h -wcmUSB.o: wcmUSB.c wcmFilter.h -wcmCommon.o: wcmCommon.c -wcmCompat.o: wcmCompat.c -wcmConfig.o: wcmConfig.c wcmFilter.h -wcmFilter.o: wcmFilter.c wcmFilter.h - -$(XF86OBJS): xf86Wacom.h ../include/Xwacom.h Makefile - $(CC) $(CFLAGS) $(DEPFLAGS) $(DLLOADER) -pipe -ansi \ +$(XF86OBJS): + $(CC) $(CFLAGS) $(WCM_DEPFLAGS) $(DLLOADER) -pipe $(WCM_CLEVEL) \ -pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \ - -I$(srcdir) $(DRIVER_INCLUDES) -Dlinux \ - -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE \ - -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE \ - -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY \ - -DTOGCUP -DXF86BIGFONT -DDPMSExtension -DPIXPRIV \ - -DRENDER -DGCCUSESGAS -DAVOID_GLYPHBLT -DSINGLEDEPTH \ - -DXFreeXDGA -DXvExtension -DXFree86LOADER \ - -DXFree86Server -DXF86VIDMODE -DXvMCExtension \ - -DSMART_SCHEDULE -DBUILDDEBUG -DXResExtension \ - -DX_BYTE_ORDER=X_LITTLE_ENDIAN $(XSERVER64) \ - -DNDEBUG -DFUNCPROTO=15 \ - $(XSERVER_CFLAGS) \ - -DNARROWPROTO -DIN_MODULE -DXFree86Module $(LINUX_INPUT) \ + $(NO_STACK_PROTECTOR) $(DEFAULT_INCLUDES) $(DRIVER_INCLUDES) \ + $(WCM_XSERVER64) $(XSERVER_CFLAGS) \ -o $@ -c $(srcdir)/$(subst .o,.c,$@) if WCM_DLLOADER -wacom_drv.so: $(XF86OBJS) +wacom_drv.so: .depend $(XF86OBJS) $(CC) -shared -nostdlib -o wacom_drv.so $(XF86OBJS) -Bstatic -lgcc else -wacom_drv.o: $(XF86OBJS) +wacom_drv.o: .depend $(XF86OBJS) $(LD) -r $(XF86OBJS) -o wacom_drv.o endif + +depend: .depend + +.depend: Makefile + @rm -f .depend + $(CC) -MM $(CFLAGS) $(DEPFLAGS) $(DRIVER_INCLUDES) $(DEFAULT_INCLUDES) $(XF86OBJS:%.o=$(srcdir)/%.c) > .depend + +-include .depend + diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/xdrv/Makefile.in /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/xdrv/Makefile.in --- wacom-tools-0.7.9.3/linuxwacom/src/xdrv/Makefile.in 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/xdrv/Makefile.in 2008-03-29 02:02:53.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -40,12 +36,13 @@ subdir = src/xdrv DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/src/include/xdrv-config.h \ + $(top_builddir)/src/include/kernel-config.h \ + $(top_builddir)/src/include/util-config.h CONFIG_CLEAN_FILES = SCRIPTS = $(noinst_SCRIPTS) SOURCES = @@ -61,8 +58,6 @@ DATA = $(x86module_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -71,7 +66,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ $(WCM_CFLAGS_STACK_PROTECTOR) +CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -81,6 +76,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -90,6 +86,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -101,9 +98,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -120,51 +117,35 @@ STRIP = @STRIP@ TCLSH = @TCLSH@ VERSION = @VERSION@ -WACOMXI_INSTALL_FALSE = @WACOMXI_INSTALL_FALSE@ -WACOMXI_INSTALL_TRUE = @WACOMXI_INSTALL_TRUE@ WCM_ARCH = @WCM_ARCH@ -WCM_CFLAGS_STACK_PROTECTOR = @WCM_CFLAGS_STACK_PROTECTOR@ +WCM_CLEVEL = @WCM_CLEVEL@ WCM_DEPFLAGS = @WCM_DEPFLAGS@ -WCM_DLLOADER_FALSE = @WCM_DLLOADER_FALSE@ -WCM_DLLOADER_TRUE = @WCM_DLLOADER_TRUE@ -WCM_ENV_NCURSES_FALSE = @WCM_ENV_NCURSES_FALSE@ -WCM_ENV_NCURSES_TRUE = @WCM_ENV_NCURSES_TRUE@ -WCM_ENV_XF86_FALSE = @WCM_ENV_XF86_FALSE@ -WCM_ENV_XF86_TRUE = @WCM_ENV_XF86_TRUE@ -WCM_ENV_XORGSDK_FALSE = @WCM_ENV_XORGSDK_FALSE@ -WCM_ENV_XORGSDK_TRUE = @WCM_ENV_XORGSDK_TRUE@ -WCM_EXPMODULES = @WCM_EXPMODULES@ -WCM_EXPPROGS = @WCM_EXPPROGS@ -WCM_KERNELDIR = @WCM_KERNELDIR@ +WCM_KERNEL_DIR = @WCM_KERNEL_DIR@ WCM_KERNEL_VER = @WCM_KERNEL_VER@ WCM_KSTACK = @WCM_KSTACK@ WCM_LIBS = @WCM_LIBS@ WCM_LIBWACOMCFG_LIBS = @WCM_LIBWACOMCFG_LIBS@ WCM_LIBWACOMCFG_VER = @WCM_LIBWACOMCFG_VER@ -WCM_LINUXWACOMDIR = @WCM_LINUXWACOMDIR@ -WCM_LINUX_INPUT = @WCM_LINUX_INPUT@ WCM_MODDIR = @WCM_MODDIR@ WCM_MODULES = @WCM_MODULES@ WCM_MODVER = @WCM_MODVER@ WCM_NO_MERGE_CONSTANTS = @WCM_NO_MERGE_CONSTANTS@ +WCM_NO_STACK_PROTECTOR = @WCM_NO_STACK_PROTECTOR@ WCM_OPTION_EVDEV = @WCM_OPTION_EVDEV@ WCM_OPTION_HID = @WCM_OPTION_HID@ WCM_OPTION_INPUT = @WCM_OPTION_INPUT@ WCM_OPTION_MOUSEDEV = @WCM_OPTION_MOUSEDEV@ WCM_OPTION_USBMOUSE = @WCM_OPTION_USBMOUSE@ WCM_OPTION_WACOM = @WCM_OPTION_WACOM@ +WCM_PREFIX = @WCM_PREFIX@ WCM_PROGS = @WCM_PROGS@ WCM_TCLLIBS = @WCM_TCLLIBS@ WCM_TCLPKGS = @WCM_TCLPKGS@ -WCM_WACOMXI_BINDIR = @WCM_WACOMXI_BINDIR@ -WCM_WACOMXI_LIBDIR = @WCM_WACOMXI_LIBDIR@ WCM_WACOMXI_LIBS = @WCM_WACOMXI_LIBS@ -WCM_XF86DIR = @WCM_XF86DIR@ WCM_XF86MODULES = @WCM_XF86MODULES@ -WCM_XF86PROGS = @WCM_XF86PROGS@ +WCM_XFREE86_DIR = @WCM_XFREE86_DIR@ WCM_XIDUMP_LIBS = @WCM_XIDUMP_LIBS@ -WCM_XLIBDIR = @WCM_XLIBDIR@ -WCM_XORGSDK = @WCM_XORGSDK@ +WCM_XORGSDK_DIR = @WCM_XORGSDK_DIR@ WCM_XSERVER64 = @WCM_XSERVER64@ WCM_XSETWACOM_LIBS = @WCM_XSETWACOM_LIBS@ XMKMF = @XMKMF@ @@ -174,13 +155,15 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ +Xlib_CFLAGS = @Xlib_CFLAGS@ +Xlib_LIBS = @Xlib_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -192,6 +175,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -219,13 +203,15 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ noinst_SCRIPTS = @WCM_XF86MODULES@ x86moduledir = @WCM_MODDIR@ x86module_DATA = @WCM_XF86MODULES@ -AM_CFLAGS = -Wall -pedantic -DEPFLAGS = @WCM_DEPFLAGS@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include # These identify which programs, libraries, and headers could # potentially be built or installed depending on the results of @@ -237,26 +223,20 @@ wcmFilter.c wcmFilter.h wcmSerial.h \ ../include/Xwacom.h -KERNEL_DIR = @WCM_KERNELDIR@ -XF86_DIR = @WCM_XF86DIR@ -XORGSDK_DIR = @WCM_XORGSDK@ -DEBUG_FLAGS = -D__JEJ_DEBUG -ARCHITECTURE = @WCM_ARCH@ -XSERVER64 = @WCM_XSERVER64@ -@WCM_ENV_XF86_TRUE@DRIVER_INCLUDES = \ -@WCM_ENV_XF86_TRUE@ -I$(XF86_DIR)/programs/Xserver/hw/xfree86/common \ -@WCM_ENV_XF86_TRUE@ -I$(XF86_DIR)/programs/Xserver/hw/xfree86/loader \ -@WCM_ENV_XF86_TRUE@ -I$(XF86_DIR)/programs/Xserver/hw/xfree86/os-support \ -@WCM_ENV_XF86_TRUE@ -I$(XF86_DIR)/programs/Xserver/include \ -@WCM_ENV_XF86_TRUE@ -I$(XF86_DIR)/programs/Xserver/mi \ -@WCM_ENV_XF86_TRUE@ -I$(XF86_DIR)/exports/include/X11 \ -@WCM_ENV_XF86_TRUE@ -I$(XF86_DIR)/include/extensions \ -@WCM_ENV_XF86_TRUE@ -I$(XF86_DIR) \ -@WCM_ENV_XF86_TRUE@ -I$(XF86_DIR)/exports/include -DWCM_XFREE86 +@WCM_ENV_XFREE86_TRUE@DRIVER_INCLUDES = \ +@WCM_ENV_XFREE86_TRUE@ -I$(WCM_XFREE86_DIR)/programs/Xserver/hw/xfree86/common \ +@WCM_ENV_XFREE86_TRUE@ -I$(WCM_XFREE86_DIR)/programs/Xserver/hw/xfree86/loader \ +@WCM_ENV_XFREE86_TRUE@ -I$(WCM_XFREE86_DIR)/programs/Xserver/hw/xfree86/os-support \ +@WCM_ENV_XFREE86_TRUE@ -I$(WCM_XFREE86_DIR)/programs/Xserver/include \ +@WCM_ENV_XFREE86_TRUE@ -I$(WCM_XFREE86_DIR)/programs/Xserver/mi \ +@WCM_ENV_XFREE86_TRUE@ -I$(WCM_XFREE86_DIR)/exports/include/X11 \ +@WCM_ENV_XFREE86_TRUE@ -I$(WCM_XFREE86_DIR)/include/extensions \ +@WCM_ENV_XFREE86_TRUE@ -I$(WCM_XFREE86_DIR) \ +@WCM_ENV_XFREE86_TRUE@ -I$(WCM_XFREE86_DIR)/exports/include -@WCM_ENV_XORGSDK_TRUE@DRIVER_INCLUDES = -I$(XORGSDK_DIR) $(X_CFLAGS) -DWCM_XORG +@WCM_ENV_XORGSDK_TRUE@DRIVER_INCLUDES = -I$(WCM_XORGSDK_DIR) $(X_CFLAGS) NO_MERGE_CONSTANTS = @WCM_NO_MERGE_CONSTANTS@ -LINUX_INPUT = @WCM_LINUX_INPUT@ +NO_STACK_PROTECTOR = @WCM_NO_STACK_PROTECTOR@ @WCM_DLLOADER_TRUE@DLLOADER = -fPIC XF86OBJS = xf86Wacom.o wcmSerial.o wcmUSB.o wcmISDV4.o \ wcmXCommand.o wcmCommon.o wcmCompat.o wcmConfig.o \ @@ -300,13 +280,9 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-x86moduleDATA: $(x86module_DATA) @$(NORMAL_INSTALL) - test -z "$(x86moduledir)" || $(mkdir_p) "$(DESTDIR)$(x86moduledir)" + test -z "$(x86moduledir)" || $(MKDIR_P) "$(DESTDIR)$(x86moduledir)" @list='$(x86module_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -329,23 +305,21 @@ distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../include - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -361,7 +335,7 @@ all-am: Makefile $(SCRIPTS) $(DATA) installdirs: for dir in "$(DESTDIR)$(x86moduledir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -393,7 +367,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -407,12 +381,20 @@ install-data-am: install-x86moduleDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -431,52 +413,42 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-x86moduleDATA +uninstall-am: uninstall-x86moduleDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ install-x86moduleDATA installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-info-am \ - uninstall-x86moduleDATA + uninstall uninstall-am uninstall-x86moduleDATA -xf86Wacom.o: xf86Wacom.c wcmFilter.h ../include/Xwacom.h -wcmXCommand.o: wcmXCommand.c wcmFilter.h ../include/Xwacom.h -wcmSerial.o: wcmSerial.c wcmSerial.h wcmFilter.h -wcmISDV4.o: wcmISDV4.c wcmSerial.h wcmFilter.h -wcmUSB.o: wcmUSB.c wcmFilter.h -wcmCommon.o: wcmCommon.c -wcmCompat.o: wcmCompat.c -wcmConfig.o: wcmConfig.c wcmFilter.h -wcmFilter.o: wcmFilter.c wcmFilter.h - -$(XF86OBJS): xf86Wacom.h ../include/Xwacom.h Makefile - $(CC) $(CFLAGS) $(DEPFLAGS) $(DLLOADER) -pipe -ansi \ +$(XF86OBJS): + $(CC) $(CFLAGS) $(WCM_DEPFLAGS) $(DLLOADER) -pipe $(WCM_CLEVEL) \ -pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \ - -I$(srcdir) $(DRIVER_INCLUDES) -Dlinux \ - -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE \ - -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE \ - -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY \ - -DTOGCUP -DXF86BIGFONT -DDPMSExtension -DPIXPRIV \ - -DRENDER -DGCCUSESGAS -DAVOID_GLYPHBLT -DSINGLEDEPTH \ - -DXFreeXDGA -DXvExtension -DXFree86LOADER \ - -DXFree86Server -DXF86VIDMODE -DXvMCExtension \ - -DSMART_SCHEDULE -DBUILDDEBUG -DXResExtension \ - -DX_BYTE_ORDER=X_LITTLE_ENDIAN $(XSERVER64) \ - -DNDEBUG -DFUNCPROTO=15 \ - $(XSERVER_CFLAGS) \ - -DNARROWPROTO -DIN_MODULE -DXFree86Module $(LINUX_INPUT) \ + $(NO_STACK_PROTECTOR) $(DEFAULT_INCLUDES) $(DRIVER_INCLUDES) \ + $(WCM_XSERVER64) $(XSERVER_CFLAGS) \ -o $@ -c $(srcdir)/$(subst .o,.c,$@) -@WCM_DLLOADER_TRUE@wacom_drv.so: $(XF86OBJS) +@WCM_DLLOADER_TRUE@wacom_drv.so: .depend $(XF86OBJS) @WCM_DLLOADER_TRUE@ $(CC) -shared -nostdlib -o wacom_drv.so $(XF86OBJS) -Bstatic -lgcc -@WCM_DLLOADER_FALSE@wacom_drv.o: $(XF86OBJS) +@WCM_DLLOADER_FALSE@wacom_drv.o: .depend $(XF86OBJS) @WCM_DLLOADER_FALSE@ $(LD) -r $(XF86OBJS) -o wacom_drv.o + +depend: .depend + +.depend: Makefile + @rm -f .depend + $(CC) -MM $(CFLAGS) $(DEPFLAGS) $(DRIVER_INCLUDES) $(DEFAULT_INCLUDES) $(XF86OBJS:%.o=$(srcdir)/%.c) > .depend + +-include .depend # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/xdrv/wcmCommon.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/xdrv/wcmCommon.c --- wacom-tools-0.7.9.3/linuxwacom/src/xdrv/wcmCommon.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/xdrv/wcmCommon.c 2008-02-29 18:58:44.000000000 -0500 @@ -1,6 +1,6 @@ /* * Copyright 1995-2002 by Frederic Lepied, France. - * Copyright 2002-2007 by Ping Cheng, Wacom Technology. + * Copyright 2002-2008 by Ping Cheng, Wacom Technology. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,7 +21,7 @@ #include "../include/Xwacom.h" /* - #if XF86_VERSION_MAJOR < 4 +#if XF86_VERSION_MAJOR < 4 * * There is a bug in XFree86 for combined left click and * other button. It'll lost left up when releases. @@ -34,7 +34,7 @@ WacomDeviceClass* wcmDeviceClasses[] = { -#ifdef LINUX_INPUT +#ifdef WCM_ENABLE_LINUXINPUT &gWacomUSBDevice, #endif &gWacomISDV4Device, @@ -42,6 +42,9 @@ NULL }; +extern int xf86WcmDevSwitchModeCall(LocalDevicePtr local, int mode); +extern void xf86WcmChangeScreen(LocalDevicePtr local, int value); + /***************************************************************************** * Static functions ****************************************************************************/ @@ -54,6 +57,98 @@ int rx, int ry, int rz, int v3, int v4, int v5); /***************************************************************************** + * xf86WcmMappingFactor -- + * calculate the proper tablet to screen mapping factor according to the + * screen/desktop size and the tablet size + ****************************************************************************/ + +void xf86WcmMappingFactor(LocalDevicePtr local) +{ + WacomDevicePtr priv = (WacomDevicePtr) local->private; + int i = 0, minX = 0, minY = 0, maxX = 0, maxY = 0; + + DBG(10, priv->debugLevel, ErrorF("xf86WcmMappingFactor \n")); + + priv->sizeX = priv->bottomX - priv->topX - 2*priv->tvoffsetX; + priv->sizeY = priv->bottomY - priv->topY - 2*priv->tvoffsetY; + priv->maxWidth = 0, priv->maxHeight = 0; + + 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 (miPointerCurrentScreen()) + priv->currentScreen = miPointerCurrentScreen()->myNum; +#else + if (miPointerGetScreen(local->dev)) + priv->currentScreen = miPointerGetScreen(local->dev)->myNum; +#endif + } + else + { + if (priv->screen_no != -1) + priv->currentScreen = priv->screen_no; + 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 (miPointerCurrentScreen()) + priv->currentScreen = miPointerCurrentScreen()->myNum; +#else + if (miPointerGetScreen(local->dev)) + priv->currentScreen = miPointerGetScreen(local->dev)->myNum; +#endif + } + } + if (priv->currentScreen == -1) /* tool on the tablet */ + priv->currentScreen = 0; + + if ( ((priv->twinview != TV_NONE) || /* TwinView & whole desktop */ + /* stay in one screen at a time (multimonitor) */ + !priv->wcmMMonitor || + /* always stay in the configured screen */ + (screenInfo.numScreens > 1 && priv->screen_no != -1)) + && (priv->flags & ABSOLUTE_FLAG) ) + { + priv->maxWidth = priv->screenBottomX[priv->currentScreen] - + priv->screenTopX[priv->currentScreen]; + priv->maxHeight = priv->screenBottomY[priv->currentScreen] - + priv->screenTopY[priv->currentScreen]; + } + else + { + /* count the whole desktop when no specific screen is defined or + * tool is in relative mode + */ + minX = priv->screenTopX[0]; + minY = priv->screenTopY[0]; + maxX = priv->screenBottomX[0]; + maxY = priv->screenBottomY[0]; + for (i = 1; i < priv->numScreen; i++) + { + if (priv->screenTopX[i] < minX) + minX = priv->screenTopX[i]; + if (priv->screenTopY[i] < minY) + minY = priv->screenTopY[i]; + if (priv->screenBottomX[i] > maxX) + maxX = priv->screenBottomX[i]; + if (priv->screenBottomY[i] > maxY) + maxY = priv->screenBottomY[i]; + } + priv->maxWidth = maxX - minX; + priv->maxHeight = maxY - minY; + } + DBG(10, priv->debugLevel, ErrorF("xf86WcmMappingFactor" + " Active tablet area x=%d y=%d map to maxWidth =%d maxHeight =%d\n", + priv->sizeX, priv->sizeY, priv->maxWidth, priv->maxHeight)); + + priv->factorX = (double)priv->maxWidth / (double)priv->sizeX; + priv->factorY = (double)priv->maxHeight / (double)priv->sizeY; + DBG(2, priv->debugLevel, ErrorF("X factor = %.3g, Y factor = %.3g\n", + priv->factorX, priv->factorY)); +} + +/***************************************************************************** * xf86WcmSetScreen -- * set to the proper screen according to the converted (x,y). * this only supports for horizontal setup now. @@ -64,118 +159,83 @@ static void xf86WcmSetScreen(LocalDevicePtr local, int *value0, int *value1) { WacomDevicePtr priv = (WacomDevicePtr) local->private; - int screenToSet = 0; - int totalWidth = 0, maxHeight = 0, leftPadding = 0; - int i, x, y, v0 = *value0, v1 = *value1; - double sizeX = priv->bottomX - priv->topX - 2*priv->tvoffsetX; - double sizeY = priv->bottomY - priv->topY - 2*priv->tvoffsetY; + int screenToSet = -1, letfPadding = 0, topPadding = 0; + int i, j, x, y, v0 = *value0, v1 = *value1; DBG(6, priv->debugLevel, ErrorF("xf86WcmSetScreen " - "v0=%d v1=%d\n", *value0, *value1)); + "v0=%d v1=%d currentScreen=%d\n", *value0, + *value1, priv->currentScreen)); if (!(local->flags & (XI86_ALWAYS_CORE | XI86_CORE_POINTER))) return; - if (!(priv->flags & ABSOLUTE_FLAG)) + if (priv->twinview != TV_NONE && priv->screen_no == -1 && (priv->flags & ABSOLUTE_FLAG)) { -#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - priv->currentScreen = miPointerCurrentScreen()->myNum; -#else - priv->currentScreen = miPointerGetScreen(local->dev)->myNum; -#endif - for (i = 0; i < priv->numScreen; i++) - totalWidth += screenInfo.screens[i]->width; + if (priv->twinview == TV_LEFT_RIGHT) + { + if (v0 > priv->bottomX - priv->tvoffsetX && v0 <= priv->bottomX) + priv->currentScreen = 1; + if (v0 > priv->topX && v0 <= priv->topX + priv->tvoffsetX) + priv->currentScreen = 0; + } + if (priv->twinview == TV_ABOVE_BELOW) + { + if (v1 > priv->bottomY - priv->tvoffsetY && v1 <= priv->bottomY) + priv->currentScreen = 1; + if (v1 > priv->topY && v1 <= priv->topY + priv->tvoffsetY) + priv->currentScreen = 0; + } + } - maxHeight = screenInfo.screens[priv->currentScreen]->height; - priv->factorX = totalWidth / sizeX; - priv->factorY = maxHeight / sizeY; - DBG(10, priv->debugLevel, ErrorF( - "xf86WcmSetScreen current=%d ToSet=%d\n", - priv->currentScreen, screenToSet)); + xf86WcmMappingFactor(local); + if (!(priv->flags & ABSOLUTE_FLAG) || screenInfo.numScreens == 1 || !priv->wcmMMonitor) return; - } - if (priv->twinview == TV_NONE) - { - v0 = v0 > priv->bottomX ? priv->bottomX - priv->topX : - v0 < priv->topX ? 0 : v0 - priv->topX; - v1 = v1 > priv->bottomY ? priv->bottomY - priv->topY : - v1 < priv->topY ? 0 : v1 - priv->topY; - } + v0 = v0 - priv->topX; + v1 = v1 - priv->topY; - /* set factorX and factorY for single screen setup since - * Top X Y and Bottom X Y can be changed while driver is running - */ - if (screenInfo.numScreens == 1 || !priv->common->wcmMMonitor) + if (priv->screen_no == -1) { - if (priv->twinview != TV_NONE) + for (i = 0; i < priv->numScreen; i++) { - if (priv->screen_no == -1) + if (v0 * priv->factorX >= priv->screenTopX[i] && + v0 * priv->factorX < priv->screenBottomX[i] - 0.5) { - if (priv->twinview == TV_LEFT_RIGHT) - { - if (v0 > priv->bottomX - priv->tvoffsetX && v0 <= priv->bottomX) - priv->currentScreen = 1; - if (v0 > priv->topX && v0 <= priv->topX + priv->tvoffsetX) - priv->currentScreen = 0; - } - if (priv->twinview == TV_ABOVE_BELOW) + + for (j = 0; j < priv->numScreen; j++) { - if (v1 > priv->bottomY - priv->tvoffsetY && v1 <= priv->bottomY) - priv->currentScreen = 1; - if (v1 > priv->topY && v1 <= priv->topY + priv->tvoffsetY) - priv->currentScreen = 0; + if (v1 * priv->factorY >= priv->screenTopY[j] && + v1 * priv->factorY <= priv->screenBottomY[j] - 0.5) + { + if (j == i) + { + screenToSet = i; + break; + } + } } + + if (screenToSet != -1) + break; } - else - priv->currentScreen = priv->screen_no; - priv->factorX = priv->tvResolution[2*priv->currentScreen] / sizeX; - priv->factorY = priv->tvResolution[2*priv->currentScreen+1] / sizeY; - } - else - { - /* tool on the tablet when driver starts */ -#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - if (miPointerCurrentScreen()) - priv->currentScreen = miPointerCurrentScreen()->myNum; -#else - if (miPointerGetScreen(local->dev)) - priv->currentScreen = miPointerGetScreen(local->dev)->myNum; -#endif - priv->factorX = screenInfo.screens[priv->currentScreen]->width / sizeX; - priv->factorY = screenInfo.screens[priv->currentScreen]->height / sizeY; } - return; - } - - if (priv->screen_no == -1) - { - for (i = 0; i < priv->numScreen; i++) + if (screenToSet != -1) { - totalWidth += screenInfo.screens[i]->width; - if (maxHeight < screenInfo.screens[i]->height) - maxHeight = screenInfo.screens[i]->height; + letfPadding = priv->screenTopX[screenToSet]; + topPadding = priv->screenBottomX[screenToSet]; } - for (i = 0; i < priv->numScreen; i++) + else { - if (v0 * totalWidth <= (leftPadding + - screenInfo.screens[i]->width) * sizeX) - { - screenToSet = i; - break; - } - leftPadding += screenInfo.screens[i]->width; + DBG(3, priv->debugLevel, ErrorF("xf86WcmSetScreen Error: " + "Can not find valid screen (currentScreen=%d)\n", + priv->currentScreen)); + return; } } - else - { + else screenToSet = priv->screen_no; - totalWidth = screenInfo.screens[screenToSet]->width; - maxHeight = screenInfo.screens[screenToSet]->height; - } - priv->factorX = totalWidth/sizeX; - priv->factorY = maxHeight/sizeY; - x = (v0 - sizeX * leftPadding / totalWidth) * priv->factorX + 0.5; - y = v1 * priv->factorY + 0.5; + + x = (double)v0 * priv->factorX - letfPadding + 0.5; + y = (double)v1 * priv->factorY - topPadding + 0.5; if (x >= screenInfo.screens[screenToSet]->width) x = screenInfo.screens[screenToSet]->width - 1; @@ -184,8 +244,8 @@ xf86XInputSetScreen(local, screenToSet, x, y); DBG(10, priv->debugLevel, ErrorF("xf86WcmSetScreen" - " current=%d ToSet=%d\n", - priv->currentScreen, screenToSet)); + " current=%d ToSet=%d\n", + priv->currentScreen, screenToSet)); priv->currentScreen = screenToSet; } @@ -497,18 +557,39 @@ break; case AC_MODETOGGLE: - if (!mask) - break; - - if (priv->flags & ABSOLUTE_FLAG) + if (mask) { - priv->flags &= ~ABSOLUTE_FLAG; - xf86ReplaceStrOption(local->options, "Mode", "Relative"); + int mode = Absolute; + if (is_absolute) + mode = Relative; + xf86WcmDevSwitchModeCall(local, mode); } - else + break; + + case AC_DISPLAYTOGGLE: + if (mask && priv->numScreen > 1) { - priv->flags |= ABSOLUTE_FLAG; - xf86ReplaceStrOption(local->options, "Mode", "Absolute"); + if (IsPad(priv)) /* toggle display for all tools except pad */ + { + WacomDevicePtr tmppriv; + for (tmppriv = common->wcmDevices; tmppriv; tmppriv = tmppriv->next) + { + if (!IsPad(tmppriv)) + { + int screen = tmppriv->screen_no; + if (++screen >= tmppriv->numScreen) + screen = -1; + xf86WcmChangeScreen(tmppriv->local, screen); + } + } + } + else /* toggle display only for the selected tool */ + { + int screen = priv->screen_no; + if (++screen >= priv->numScreen) + screen = -1; + xf86WcmChangeScreen(local, screen); + } } break; @@ -838,14 +919,6 @@ x, y, z, v3, v4, v5, id, serial, is_button ? "true" : "false", buttons)); - if (x > priv->bottomX) - x = priv->bottomX; - if (x < priv->topX) - x = priv->topX; - if (y > priv->bottomY) - y = priv->bottomY; - if (y < priv->topY) - y = priv->topY; priv->currentX = x; priv->currentY = y; @@ -897,13 +970,6 @@ } } -#if defined WCM_XORG && GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 0 - /* Ugly hack for Xorg 7.3, which doesn't call xf86WcmDevConvert - * for coordinate conversion at the moment */ - x = (int)((double)(x - priv->topX) * priv->factorX + 0.5); - y = (int)((double)(y - priv->topY) * priv->factorY + 0.5); -#endif - if (type != PAD_ID) { /* coordinates are ready we can send events */ @@ -922,6 +988,22 @@ if (!is_absolute) x *= priv->factorY / priv->factorX; +#ifdef WCM_XORG_TABLET_SCALING + /* Ugly hack for Xorg 7.3, which doesn't call xf86WcmDevConvert + * for coordinate conversion at the moment */ + /* The +-0.4 is to increase the sensitivity in relative mode. + * Must be sensitive to which way the tool is moved or one way + * will get a severe penalty for small movements. */ + x = (int)((double)(x - priv->topX) * priv->factorX + (x>=0?0.4:-0.4)); + y = (int)((double)(y - priv->topY) * priv->factorY + (y>=0?0.4:-0.4)); + + /* map to a specific screen */ + if (priv->screen_no != -1 || priv->twinview != TV_NONE) + { + x += priv->screenTopX[priv->currentScreen]; + y += priv->screenTopY[priv->currentScreen]; + } +#endif sendCommonEvents(local, ds, x, y, z, v3, v4, v5); if(!(priv->flags & BUTTONS_ONLY_FLAG)) @@ -1002,6 +1084,7 @@ priv->oldStripY = 0; priv->oldRot = 0; priv->oldThrottle = 0; + priv->devReverseCount = 0; } } @@ -1059,10 +1142,12 @@ WacomDevicePtr priv = (WacomDevicePtr)local->private; WacomCommonPtr common = priv->common; WacomDeviceClass** ppDevCls; + char id[BUFFER_SIZE]; + float version; DBG(1, priv->debugLevel, ErrorF("opening %s\n", common->wcmDevice)); - local->fd = xf86WcmOpenTablet(local); + local->fd = xf86OpenSerial(local->options); if (local->fd < 0) { ErrorF("Error opening %s : %s\n", common->wcmDevice, @@ -1081,7 +1166,14 @@ } /* Initialize the tablet */ - return common->wcmDevCls->Init(local); + if(common->wcmDevCls->Init(local, id, &version) != Success || + xf86WcmInitTablet(local, id, version) != Success) + { + xf86CloseSerial(local->fd); + local->fd = -1; + return !Success; + } + return Success; } /* reset raw data counters for filters */ @@ -1140,7 +1232,7 @@ ds.discard_first, ds.proximity, ds.sample, pChannel->nSamples)); -#ifdef LINUX_INPUT +#ifdef WCM_ENABLE_LINUXINPUT /* Discard the first 2 USB packages due to events delay */ if ( (pChannel->nSamples < 2) && (common->wcmDevCls == &gWacomUSBDevice) && ds.device_type != PAD_ID ) { @@ -1549,13 +1641,13 @@ * xf86WcmInitTablet -- common initialization for all tablets ****************************************************************************/ -int xf86WcmInitTablet(LocalDevicePtr local, WacomModelPtr model, - const char* id, float version) +int xf86WcmInitTablet(LocalDevicePtr local, const char* id, float version) { - WacomCommonPtr common = ((WacomDevicePtr)(local->private))->common; + WacomCommonPtr common = ((WacomDevicePtr)(local->private))->common; WacomToolPtr toollist = common->wcmTool; WacomToolAreaPtr arealist; int temp; + WacomModelPtr model = common->wcmModel; /* Initialize the tablet */ model->Initialize(common,id,version); @@ -1647,9 +1739,6 @@ if (model->Start && (model->Start(local) != Success)) return !Success; - /*set the model */ - common->wcmModel = model; - return Success; } @@ -1678,3 +1767,136 @@ FILTER_PRESSURE_RES; } } + +/***************************************************************************** + * xf86WcmInitialTVScreens + ****************************************************************************/ + +static void xf86WcmInitialTVScreens(LocalDevicePtr local) +{ + WacomDevicePtr priv = (WacomDevicePtr)local->private; + + if (priv->twinview == TV_NONE) + return; + + priv->numScreen = 2; + + if (priv->twinview == TV_LEFT_RIGHT) + { + /* it does not need the offset if always map to a specific screen */ + if (priv->screen_no == -1) + { + priv->tvoffsetX = 60; + priv->tvoffsetY = 0; + } + + /* default resolution */ + if(!priv->tvResolution[0]) + { + priv->tvResolution[0] = screenInfo.screens[0]->width/2; + priv->tvResolution[1] = screenInfo.screens[0]->height; + priv->tvResolution[2] = priv->tvResolution[0]; + priv->tvResolution[3] = priv->tvResolution[1]; + } + } + else if (priv->twinview == TV_ABOVE_BELOW) + { + /* it does not need the offset if always map to a specific screen */ + if (priv->screen_no == -1) + { + priv->tvoffsetX = 0; + priv->tvoffsetY = 60; + } + + /* default resolution */ + if(!priv->tvResolution[0]) + { + priv->tvResolution[0] = screenInfo.screens[0]->width; + priv->tvResolution[1] = screenInfo.screens[0]->height/2; + priv->tvResolution[2] = priv->tvResolution[0]; + priv->tvResolution[3] = priv->tvResolution[1]; + } + } + + /* initial screen info */ + priv->screenTopX[0] = 0; + priv->screenTopY[0] = 0; + priv->screenBottomX[0] = priv->tvResolution[0]; + priv->screenBottomY[0] = priv->tvResolution[1]; + if (priv->twinview == TV_ABOVE_BELOW) + { + priv->screenTopX[1] = 0; + priv->screenTopY[1] = priv->tvResolution[1]; + priv->screenBottomX[1] = priv->tvResolution[2]; + priv->screenBottomY[1] = priv->tvResolution[1] + priv->tvResolution[3]; + } + if (priv->twinview == TV_LEFT_RIGHT) + { + priv->screenTopX[1] = priv->tvResolution[0]; + priv->screenTopY[1] = 0; + priv->screenBottomX[1] = priv->tvResolution[0] + priv->tvResolution[2]; + priv->screenBottomY[1] = priv->tvResolution[3]; + } + + DBG(10, priv->debugLevel, ErrorF("xf86WcmInitialTVScreens for \"%s\" " + "topX0=%d topY0=%d bottomX0=%d bottomY0=%d " + "topX1=%d topY1=%d bottomX1=%d bottomY1=%d \n", + local->name, priv->screenTopX[0], priv->screenTopY[0], + priv->screenBottomX[0], priv->screenBottomY[0], + priv->screenTopX[1], priv->screenTopY[1], + priv->screenBottomX[1], priv->screenBottomY[1])); +} + +/***************************************************************************** + * xf86WcmInitialScreens + ****************************************************************************/ + +void xf86WcmInitialScreens(LocalDevicePtr local) +{ + WacomDevicePtr priv = (WacomDevicePtr)local->private; + int i; + + priv->tvoffsetX = 0; + priv->tvoffsetY = 0; + if (priv->twinview != TV_NONE) + { + xf86WcmInitialTVScreens(local); + return; + } + + /* initial screen info */ + priv->numScreen = screenInfo.numScreens; + priv->screenTopX[0] = 0; + priv->screenTopY[0] = 0; + priv->screenBottomX[0] = 0; + priv->screenBottomY[0] = 0; + for (i=0; iscreenTopX[i] = dixScreenOrigins[i].x; + priv->screenTopY[i] = dixScreenOrigins[i].y; + priv->screenBottomX[i] = dixScreenOrigins[i].x; + priv->screenBottomY[i] = dixScreenOrigins[i].y; + + DBG(10, priv->debugLevel, ErrorF("xf86WcmInitialScreens from dix for \"%s\" " + "ScreenOrigins[%d].x=%d ScreenOrigins[%d].y=%d \n", + local->name, i, priv->screenTopX[i], i, priv->screenTopY[i])); +#else + if (i > 0) + { + /* only support left to right in this case */ + priv->screenTopX[i] = priv->screenBottomX[i-1]; + priv->screenTopY[i] = 0; + priv->screenBottomX[i] = priv->screenTopX[i]; + priv->screenBottomY[i] = 0; + } +#endif + priv->screenBottomX[i] += screenInfo.screens[i]->width; + priv->screenBottomY[i] += screenInfo.screens[i]->height; + + DBG(10, priv->debugLevel, ErrorF("xf86WcmInitialScreens for \"%s\" " + "topX[%d]=%d topY[%d]=%d bottomX[%d]=%d bottomY[%d]=%d \n", + local->name, i, priv->screenTopX[i], i, priv->screenTopY[i], + i, priv->screenBottomX[i], i, priv->screenBottomY[i])); + } +} diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/xdrv/wcmConfig.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/xdrv/wcmConfig.c --- wacom-tools-0.7.9.3/linuxwacom/src/xdrv/wcmConfig.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/xdrv/wcmConfig.c 2008-02-29 18:58:44.000000000 -0500 @@ -1,6 +1,6 @@ /* * Copyright 1995-2002 by Frederic Lepied, France. - * Copyright 2002-2007 by Ping Cheng, Wacom. + * Copyright 2002-2008 by Ping Cheng, Wacom. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -107,6 +107,8 @@ priv->topY = 0; /* Y top */ priv->bottomX = 0; /* X bottom */ priv->bottomY = 0; /* Y bottom */ + priv->sizeX = 0; /* active X size */ + priv->sizeY = 0; /* active Y size */ priv->factorX = 0.0; /* X factor */ priv->factorY = 0.0; /* Y factor */ priv->common = common; /* common info pointer */ @@ -146,25 +148,31 @@ for (j=0; j<256; j++) priv->keys[i][j] = 0; - priv->nbuttons = MAX_BUTTONS; /* Default number of buttons */ - priv->relup = 5; /* Default relative wheel up event */ - priv->reldn = 4; /* Default relative wheel down event */ - priv->wheelup = 0; /* Default absolute wheel up event */ - priv->wheeldn = 0; /* Default absolute wheel down event */ - priv->striplup = 4; /* Default left strip up event */ - priv->stripldn = 5; /* Default left strip down event */ - priv->striprup = 4; /* Default right strip up event */ - priv->striprdn = 5; /* Default right strip down event */ - priv->naxes = 6; /* Default number of axes */ - priv->debugLevel = 0; /* debug level */ + priv->nbuttons = MAX_BUTTONS; /* Default number of buttons */ + priv->relup = 5; /* Default relative wheel up event */ + priv->reldn = 4; /* Default relative wheel down event */ + + priv->wheelup = IsPad (priv) ? 5 : 0; /* Default absolute wheel up event */ + priv->wheeldn = IsPad (priv) ? 4 : 0; /* Default absolute wheel down event */ + priv->striplup = 4; /* Default left strip up event */ + priv->stripldn = 5; /* Default left strip down event */ + priv->striprup = 4; /* Default right strip up event */ + priv->striprdn = 5; /* Default right strip down event */ + priv->naxes = 6; /* Default number of axes */ + priv->debugLevel = 0; /* debug level */ priv->numScreen = screenInfo.numScreens; /* configured screens count */ - priv->currentScreen = 0; /* current screen in display */ + priv->currentScreen = -1; /* current screen in display */ + priv->maxWidth = 0; /* max active screen width */ + priv->maxHeight = 0; /* max active screen height */ priv->twinview = TV_NONE; /* not using twinview gfx */ priv->tvoffsetX = 0; /* none X edge offset for TwinView setup */ priv->tvoffsetY = 0; /* none Y edge offset for TwinView setup */ for (i=0; i<4; i++) priv->tvResolution[i] = 0; /* unconfigured twinview resolution */ + priv->wcmMMonitor = 1; /* enabled (=1) to support multi-monitor desktop. */ + /* disabled (=0) when user doesn't want to move the */ + /* cursor from one screen to another screen */ /* JEJ - throttle sampling code */ priv->throttleValue = 0; @@ -193,9 +201,6 @@ common->wcmDevCls = &gWacomSerialDevice; /* device-specific functions */ common->wcmModel = NULL; /* model-specific functions */ common->wcmEraserID = 0; /* eraser id associated with the stylus */ - common->wcmMMonitor = 1; /* enabled (=1) to support multi-monitor desktop. */ - /* disabled (=0) when user doesn't want to move the */ - /* cursor from one screen to another screen */ common->wcmTPCButtonDefault = 0; /* default Tablet PC button support is off */ common->wcmTPCButton = common->wcmTPCButtonDefault; /* set Tablet PC button on/off */ @@ -573,7 +578,7 @@ common->wcmFlags |= RAW_FILTERING_FLAG; } -#ifdef LINUX_INPUT +#ifdef WCM_ENABLE_LINUXINPUT if (xf86SetBoolOption(local->options, "USB", (common->wcmDevCls == &gWacomUSBDevice))) { @@ -782,10 +787,10 @@ } /* Cursor stays in one monitor in a multimonitor setup */ - if ( !common->wcmMMonitor ) + if ( !priv->wcmMMonitor ) { - common->wcmMMonitor = xf86SetBoolOption(local->options, "MMonitor", 1); - if ( !common->wcmMMonitor ) + priv->wcmMMonitor = xf86SetBoolOption(local->options, "MMonitor", 1); + if ( !priv->wcmMMonitor ) xf86Msg(X_CONFIG, "%s: Cursor will stay in one monitor \n", common->wcmDevice); } diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/xdrv/wcmISDV4.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/xdrv/wcmISDV4.c --- wacom-tools-0.7.9.3/linuxwacom/src/xdrv/wcmISDV4.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/xdrv/wcmISDV4.c 2008-02-29 18:58:44.000000000 -0500 @@ -22,7 +22,7 @@ #include "wcmFilter.h" static Bool isdv4Detect(LocalDevicePtr); -static Bool isdv4Init(LocalDevicePtr); +static Bool isdv4Init(LocalDevicePtr, char* id, float *version); static void isdv4InitISDV4(WacomCommonPtr, const char* id, float version); static int isdv4GetRanges(LocalDevicePtr); static int isdv4StartTablet(LocalDevicePtr); @@ -64,18 +64,18 @@ * isdv4Init -- ****************************************************************************/ -static Bool isdv4Init(LocalDevicePtr local) +static Bool isdv4Init(LocalDevicePtr local, char* id, float *version) { int err; WacomDevicePtr priv = (WacomDevicePtr)local->private; WacomCommonPtr common = priv->common; - DBG(1, priv->debugLevel, ErrorF("initializing ISDV4 tablet\n")); + DBG(1, priv->debugLevel, ErrorF("initializing ISDV4 tablet\n")); /* Try 19200 first */ if (xf86WcmSetSerialSpeed(local->fd, common->wcmISDV4Speed) < 0) return !Success; - + /* Send stop command to the tablet */ err = xf86WcmWrite(local->fd, WC_ISDV4_STOP, strlen(WC_ISDV4_STOP)); if (err == -1) @@ -88,7 +88,15 @@ if (xf86WcmWait(250)) return !Success; - return xf86WcmInitTablet(local,&isdv4General,"ISDV4", common->wcmVersion); + if(id) + strcpy(id, "ISDV4"); + if(version) + *version = common->wcmVersion; + + /*set the model */ + common->wcmModel = &isdv4General; + + return Success; } /***************************************************************************** @@ -165,7 +173,9 @@ if (common->wcmISDV4Speed != 38400) { common->wcmISDV4Speed = 38400; - return isdv4Init(local); + if(isdv4Init(local, NULL, NULL) != Success) + return !Success; + return isdv4GetRanges(local); } else { diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/xdrv/wcmSerial.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/xdrv/wcmSerial.c --- wacom-tools-0.7.9.3/linuxwacom/src/xdrv/wcmSerial.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/xdrv/wcmSerial.c 2008-02-29 18:58:44.000000000 -0500 @@ -1,6 +1,6 @@ /* * Copyright 1995-2002 by Frederic Lepied, France. - * Copyright 2002-2007 by Ping Cheng, Wacom Technology. + * Copyright 2002-2008 by Ping Cheng, Wacom Technology. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,9 +23,9 @@ /* Serial Support */ static Bool serialDetect(LocalDevicePtr pDev); -static Bool serialInit(LocalDevicePtr pDev); +static Bool serialInit(LocalDevicePtr pDev, char* id, float *version); -static int serialInitTablet(LocalDevicePtr local); +static int serialInitTablet(LocalDevicePtr local, char* id, float *version); static void serialInitIntuos(WacomCommonPtr common, const char* id, float version); static void serialInitIntuos2(WacomCommonPtr common, const char* id, float version); static void serialInitCintiq(WacomCommonPtr common, const char* id, float version); @@ -273,11 +273,11 @@ "after %d tries\n", request, MAXTRY); return NULL; } - + do { maxtry = MAXTRY; - + /* Read the first byte of the answer which must * be equal to the first byte of the request. */ @@ -293,7 +293,7 @@ return NULL; } } - maxtry--; + maxtry--; } while ((answer[0] != request[0]) && maxtry); if (maxtry == 0) @@ -307,7 +307,7 @@ /* Read the second byte of the answer which must be equal * to the second byte of the request. */ do - { + { maxtry = MAXTRY; do { @@ -321,9 +321,9 @@ return NULL; } } - maxtry--; + maxtry--; } while ((nr <= 0) && maxtry); - + if (maxtry == 0) { ErrorF("Wacom unable to read second byte of " @@ -335,7 +335,7 @@ if (answer[1] != request[1]) answer[0] = answer[1]; - + } while ((answer[0] == request[0]) && (answer[1] != request[1])); } while ((answer[0] != request[0]) && (answer[1] != request[1])); @@ -345,7 +345,7 @@ len = 2; maxtry = MAXTRY; do - { + { do { if ((nr = xf86WcmWaitForTablet(fd)) > 0) @@ -380,9 +380,9 @@ if (len <= 3) return NULL; - + answer[len-1] = '\0'; - + return answer; } @@ -391,17 +391,17 @@ return 1; } -static Bool serialInit(LocalDevicePtr local) +static Bool serialInit(LocalDevicePtr local, char* id, float *version) { int err; WacomDevicePtr priv = (WacomDevicePtr)local->private; - DBG(1, priv->debugLevel, ErrorF("initializing serial tablet\n")); + DBG(1, priv->debugLevel, ErrorF("initializing serial tablet\n")); /* Set the speed of the serial link to 38400 */ if (xf86WcmSetSerialSpeed(local->fd, 38400) < 0) return !Success; - + /* Send reset to the tablet */ err = xf86WcmWrite(local->fd, WC_RESET_BAUD, strlen(WC_RESET_BAUD)); @@ -411,7 +411,7 @@ ErrorF("Wacom xf86WcmWrite error : %s\n", strerror(errno)); return !Success; } - + /* Wait 250 mSecs */ if (xf86WcmWait(250)) return !Success; @@ -423,7 +423,7 @@ ErrorF("Wacom xf86WcmWrite error : %s\n", strerror(errno)); return !Success; } - + /* Wait 75 mSecs */ if (xf86WcmWait(75)) return !Success; @@ -431,7 +431,7 @@ /* Set the speed of the serial link to 19200 */ if (xf86WcmSetSerialSpeed(local->fd, 19200) < 0) return !Success; - + /* Send reset to the tablet */ err = xf86WcmWrite(local->fd, WC_RESET_BAUD, strlen(WC_RESET_BAUD)); @@ -441,7 +441,7 @@ ErrorF("Wacom xf86WcmWrite error : %s\n", strerror(errno)); return !Success; } - + /* Wait 250 mSecs */ if (xf86WcmWait(250)) return !Success; @@ -453,7 +453,7 @@ ErrorF("Wacom xf86WcmWrite error : %s\n", strerror(errno)); return !Success; } - + /* Wait 75 mSecs */ if (xf86WcmWait(75)) return !Success; @@ -461,7 +461,7 @@ /* Set the speed of the serial link to 9600 */ if (xf86WcmSetSerialSpeed(local->fd, 9600) < 0) return !Success; - + /* Send reset to the tablet */ err = xf86WcmWrite(local->fd, WC_RESET_BAUD, strlen(WC_RESET_BAUD)); if (err == -1) @@ -469,7 +469,7 @@ ErrorF("Wacom xf86WcmWrite error : %s\n", strerror(errno)); return !Success; } - + /* Wait 250 mSecs */ if (xf86WcmWait(250)) return !Success; @@ -487,14 +487,7 @@ xf86WcmFlushTablet(local->fd); - if (serialInitTablet(local) == !Success) - { - xf86WcmClose(local->fd); - local->fd = -1; - return !Success; - } - - return Success; + return serialInitTablet(local, id, version); } /***************************************************************************** @@ -502,83 +495,70 @@ * Initialize the tablet ****************************************************************************/ - -static int serialInitTablet(LocalDevicePtr local) +static int serialInitTablet(LocalDevicePtr local, char* id, float *version) { int loop, idx; - char id[BUFFER_SIZE]; - float version; + char getID[BUFFER_SIZE]; WacomDevicePtr priv = (WacomDevicePtr)local->private; - WacomCommonPtr common = priv->common; + WacomCommonPtr common = priv->common; - WacomModelPtr model = NULL; + DBG(2, priv->debugLevel, ErrorF("reading model\n")); - /* if model is forced, initialize */ - if (model != NULL) - { - id[0] = '\0'; - version = 0.0F; - } + if (!xf86WcmSendRequest(local->fd, WC_MODEL, getID, sizeof(getID))) + return !Success; - /* otherwise, query and initialize */ - else - { - DBG(2, priv->debugLevel, ErrorF("reading model\n")); - if (!xf86WcmSendRequest(local->fd, WC_MODEL, id, sizeof(id))) - return !Success; + DBG(2, priv->debugLevel, ErrorF("%s\n", getID)); - DBG(2, priv->debugLevel, ErrorF("%s\n", id)); - - if (xf86Verbose) - ErrorF("%s Wacom tablet model : %s\n", - XCONFIG_PROBED, id+2); - - /* Answer is in the form ~#Tablet-Model VRom_Version - * look for the first V from the end of the string - * this seems to be the better way to find the version - * of the ROM */ - for(loop=strlen(id); loop>=0 && *(id+loop) != 'V'; loop--); - for(idx=loop; idx=0 && *(getID+loop) != 'V'; loop--); + for(idx=loop; idxtablet_id = 0x20; - } - else if (id[2] == 'X' && id[3] == 'D') - { - model = &serialIntuos2; - common->tablet_id = 0x40; - } - else if ( (id[2] == 'P' && id[3] == 'L') || - (id[2] == 'D' && id[3] == 'T') ) - { - model = &serialCintiq; - common->tablet_id = 0x30; - } - else if (id[2] == 'C' && id[3] == 'T') - { - model = &serialPenPartner; - common->tablet_id = 0x00; - } - else if (id[2] == 'E' && id[3] == 'T') - { - model = &serialGraphire; - common->tablet_id = 0x10; - } - else - { - model = &serialProtocol4; - common->tablet_id = 0x03; - } + /* Extract version numbers */ + sscanf(getID+loop+1, "%f", version); + + /* Detect tablet model based on identifier */ + if (getID[2] == 'G' && getID[3] == 'D') + { + common->wcmModel = &serialIntuos; + common->tablet_id = 0x20; + } + else if (getID[2] == 'X' && getID[3] == 'D') + { + common->wcmModel = &serialIntuos2; + common->tablet_id = 0x40; + } + else if ( (getID[2] == 'P' && getID[3] == 'L') || + (getID[2] == 'D' && getID[3] == 'T') ) + { + common->wcmModel = &serialCintiq; + common->tablet_id = 0x30; + } + else if (getID[2] == 'C' && getID[3] == 'T') + { + common->wcmModel = &serialPenPartner; + common->tablet_id = 0x00; } + else if (getID[2] == 'E' && getID[3] == 'T') + { + common->wcmModel = &serialGraphire; + common->tablet_id = 0x10; + } + else + { + common->wcmModel = &serialProtocol4; + common->tablet_id = 0x03; + } + sprintf(id, "%s", getID); - return xf86WcmInitTablet(local,model,id,version); + return Success; } static int serialParseGraphire(LocalDevicePtr local, const unsigned char* data) @@ -719,7 +699,7 @@ RESET_RELATIVE(*ds); DBG(7, common->debugLevel, ErrorF("packet header = %x\n", data[0])); - + /* Device ID packet */ if ((data[0] & 0xfc) == 0xc0) { @@ -745,7 +725,7 @@ ds->device_type = CURSOR_ID; else ds->device_type = ERASER_ID; - + DBG(6, common->debugLevel, ErrorF( "device_id=%x serial_num=%u type=%s\n", ds->device_id, ds->serial_num, @@ -1013,7 +993,7 @@ int a, b; char buffer[BUFFER_SIZE], header[BUFFER_SIZE]; WacomDevicePtr priv = (WacomDevicePtr)local->private; - WacomCommonPtr common = priv->common; + WacomCommonPtr common = priv->common; if (!(common->wcmResolX && common->wcmResolY)) { @@ -1057,7 +1037,7 @@ { char buffer[BUFFER_SIZE]; WacomDevicePtr priv = (WacomDevicePtr)local->private; - WacomCommonPtr common = priv->common; + WacomCommonPtr common = priv->common; if (!(common->wcmMaxX && common->wcmMaxY)) { @@ -1100,7 +1080,7 @@ int err; err = xf86WcmWrite(local->fd, WC_RESET, strlen(WC_RESET)); - + if (xf86WcmWait(75)) return !Success; err = xf86WcmWrite(local->fd, pl_setup_string, @@ -1126,7 +1106,7 @@ int err; err = xf86WcmWrite(local->fd, WC_RESET, strlen(WC_RESET)); - + if (xf86WcmWait(75)) return !Success; err = xf86WcmWrite(local->fd, setup_string, @@ -1286,7 +1266,7 @@ ds->buttons = 0; ds->device_id = ERASER_DEVICE_ID; } - + DBG(8, common->debugLevel, ErrorF("serialParseP4Common %s\n", ds->device_type == CURSOR_ID ? "CURSOR" : ds->device_type == ERASER_ID ? "ERASER " : diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/xdrv/wcmUSB.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/xdrv/wcmUSB.c --- wacom-tools-0.7.9.3/linuxwacom/src/xdrv/wcmUSB.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/xdrv/wcmUSB.c 2008-02-29 18:58:44.000000000 -0500 @@ -1,6 +1,6 @@ /* * Copyright 1995-2002 by Frederic Lepied, France. - * Copyright 2002-2007 by Ping Cheng, Wacom Technology. + * Copyright 2002-2008 by Ping Cheng, Wacom Technology. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,7 +20,7 @@ #include "xf86Wacom.h" #include "wcmFilter.h" -#ifdef LINUX_INPUT +#ifdef WCM_ENABLE_LINUXINPUT #include @@ -46,7 +46,7 @@ #endif static Bool usbDetect(LocalDevicePtr); -Bool usbWcmInit(LocalDevicePtr pDev); +Bool usbWcmInit(LocalDevicePtr pDev, char* id, float *version); static void usbInitProtocol5(WacomCommonPtr common, const char* id, float version); @@ -350,7 +350,7 @@ WacomDevicePtr priv = (WacomDevicePtr)local->private; DBG(1, priv->debugLevel, ErrorF("usbDetect\n")); - + SYSCALL(err = ioctl(local->fd, EVIOCGVERSION, &version)); if (err < 0) @@ -459,20 +459,20 @@ { 0xB7, 5080, 5080, &usbIntuos3 }, /* Intuos3 4x6 */ { 0x3F, 5080, 5080, &usbCintiqV5 }, /* Cintiq 21UX */ + { 0xC5, 5080, 5080, &usbCintiqV5 }, /* Cintiq 20WSX */ { 0xC6, 5080, 5080, &usbCintiqV5 } /* Cintiq 12WX */ }; -Bool usbWcmInit(LocalDevicePtr local) +Bool usbWcmInit(LocalDevicePtr local, char* id, float *version) { int i; short sID[4]; - char id[BUFFER_SIZE]; - WacomModelPtr model = NULL; unsigned long keys[NBITS(KEY_MAX)]; WacomDevicePtr priv = (WacomDevicePtr)local->private; WacomCommonPtr common = priv->common; - DBG(1, priv->debugLevel, ErrorF("initializing USB tablet\n")); + DBG(1, priv->debugLevel, ErrorF("initializing USB tablet\n")); + *version = 0.0; /* fetch vendor, product, and model name */ ioctl(local->fd, EVIOCGID, sID); @@ -486,15 +486,15 @@ for (i = 0; i < sizeof (WacomModelDesc) / sizeof (WacomModelDesc [0]); i++) if (common->tablet_id == WacomModelDesc [i].model_id) { - model = WacomModelDesc [i].model; + common->wcmModel = WacomModelDesc [i].model; common->wcmResolX = WacomModelDesc [i].xRes; common->wcmResolY = WacomModelDesc [i].yRes; } } - if (!model) + if (!common->wcmModel) { - model = &usbUnknown; + common->wcmModel = &usbUnknown; common->wcmResolX = common->wcmResolY = 1016; } @@ -527,7 +527,7 @@ common->wcmFlags |= TILT_ENABLED_FLAG; - return xf86WcmInitTablet(local,model,id,0.0); + return Success; } static void usbInitProtocol5(WacomCommonPtr common, const char* id, @@ -536,7 +536,7 @@ common->wcmProtocolLevel = 5; common->wcmPktLength = sizeof(struct input_event); common->wcmCursorProxoutDistDefault - = PROXOUT_INTUOS_DISTANCE; + = PROXOUT_INTUOS_DISTANCE; /* reinitialize max here since 0 is for Graphire series */ common->wcmMaxCursorDist = 256; @@ -548,7 +548,7 @@ common->wcmProtocolLevel = 4; common->wcmPktLength = sizeof(struct input_event); common->wcmCursorProxoutDistDefault - = PROXOUT_GRAPHIRE_DISTANCE; + = PROXOUT_GRAPHIRE_DISTANCE; } int usbWcmGetRanges(LocalDevicePtr local) @@ -841,7 +841,7 @@ { event = common->wcmEvents + i; DBG(11, common->debugLevel, ErrorF("usbParseChannel " - "event[%d]->type=%d code=%d value=%d\n", + "event[%d]->type=%d code=%d value=%d\n", i, event->type, event->code, event->value)); /* absolute events */ @@ -969,4 +969,4 @@ xf86WcmEvent(common, channel, ds); } -#endif /* LINUX_INPUT */ +#endif /* WCM_ENABLE_LINUXINPUT */ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/xdrv/wcmXCommand.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/xdrv/wcmXCommand.c --- wacom-tools-0.7.9.3/linuxwacom/src/xdrv/wcmXCommand.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/xdrv/wcmXCommand.c 2008-02-29 18:58:44.000000000 -0500 @@ -1,5 +1,5 @@ /* - * Copyright 2007 by Ping Cheng, Wacom Technology. + * Copyright 2007-2008 by Ping Cheng, Wacom Technology. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -29,11 +29,12 @@ #include "wcmFilter.h" extern void xf86WcmInitialCoordinates(LocalDevicePtr local, int axes); -extern void xf86WcmInitialTVScreens(LocalDevicePtr local); +extern void xf86WcmInitialScreens(LocalDevicePtr local); /***************************************************************************** * xf86WcmSetPadCoreMode ****************************************************************************/ + int xf86WcmSetPadCoreMode(LocalDevicePtr local) { WacomDevicePtr priv = (WacomDevicePtr)local->private; @@ -55,6 +56,88 @@ } /***************************************************************************** +* xf86WcmDevSwitchModeCall -- +*****************************************************************************/ + +int xf86WcmDevSwitchModeCall(LocalDevicePtr local, int mode) +{ + WacomDevicePtr priv = (WacomDevicePtr)local->private; + int is_absolute = priv->flags & ABSOLUTE_FLAG; + + DBG(3, priv->debugLevel, ErrorF("xf86WcmSwitchModeCall for %s to mode=%d\n", + local->name, mode)); + + /* Pad is always in relative mode when it's a core device. + * Always in absolute mode when it is not a core device. + */ + if (IsPad(priv)) + return xf86WcmSetPadCoreMode(local); + + if ((mode == Absolute) && !is_absolute) + { + priv->flags |= ABSOLUTE_FLAG; + xf86ReplaceStrOption(local->options, "Mode", "Absolute"); + xf86WcmMappingFactor(local); + xf86WcmInitialCoordinates(local, 0); + xf86WcmInitialCoordinates(local, 1); + } + else if ((mode == Relative) && is_absolute) + { + priv->flags &= ~ABSOLUTE_FLAG; + xf86ReplaceStrOption(local->options, "Mode", "Relative"); + xf86WcmMappingFactor(local); + xf86WcmInitialCoordinates(local, 0); + xf86WcmInitialCoordinates(local, 1); + } + else if ( (mode != Absolute) && (mode != Relative)) + { + DBG(10, priv->debugLevel, ErrorF("xf86WcmSwitchModeCall" + " for %s invalid mode=%d\n", local->name, mode)); + return BadMatch; + } + + return Success; +} + +/***************************************************************************** +* xf86WcmDevSwitchMode -- +*****************************************************************************/ + +int xf86WcmDevSwitchMode(ClientPtr client, DeviceIntPtr dev, int mode) +{ + LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate; + WacomDevicePtr priv = (WacomDevicePtr)local->private; + + DBG(3, priv->debugLevel, ErrorF("xf86WcmSwitchMode dev=%p mode=%d\n", + (void *)dev, mode)); + + /* Share this call with sendAButton in wcmCommon.c */ + return xf86WcmDevSwitchModeCall(local, mode); +} + +/***************************************************************************** + * xf86WcmChangeScreen + ****************************************************************************/ + +void xf86WcmChangeScreen(LocalDevicePtr local, int value) +{ + WacomDevicePtr priv = (WacomDevicePtr)local->private; + + if (priv->screen_no != value) + { + priv->screen_no = value; + xf86ReplaceIntOption(local->options, "ScreenNo", value); + } + + if (priv->screen_no != -1) + priv->currentScreen = priv->screen_no; + xf86WcmInitialScreens(local); + xf86WcmMappingFactor(local); + xf86WcmInitialCoordinates(local, 0); + xf86WcmInitialCoordinates(local, 1); +} + +/***************************************************************************** * xf86WcmSetParam ****************************************************************************/ @@ -89,6 +172,7 @@ /* Area definition is ok */ xf86ReplaceIntOption(local->options, "TopX", value); priv->topX = xf86SetIntOption(local->options, "TopX", 0); + xf86WcmMappingFactor(local); xf86WcmInitialCoordinates(local, 0); } break; @@ -107,6 +191,7 @@ /* Area definition is ok */ xf86ReplaceIntOption(local->options, "TopY", value); priv->topY = xf86SetIntOption(local->options, "TopY", 0); + xf86WcmMappingFactor(local); xf86WcmInitialCoordinates(local, 1); } break; @@ -125,6 +210,7 @@ /* Area definition is ok */ xf86ReplaceIntOption(local->options, "BottomX", value); priv->bottomX = xf86SetIntOption(local->options, "BottomX", 0); + xf86WcmMappingFactor(local); xf86WcmInitialCoordinates(local, 0); } break; @@ -143,6 +229,7 @@ /* Area definition is ok */ xf86ReplaceIntOption(local->options, "BottomY", value); priv->bottomY = xf86SetIntOption(local->options, "BottomY", 0); + xf86WcmMappingFactor(local); xf86WcmInitialCoordinates(local, 1); } break; @@ -211,25 +298,9 @@ { int is_absolute = priv->flags & ABSOLUTE_FLAG; if ((value < 0) || (value > 1)) return BadValue; - if (value == is_absolute) - break; - - if (IsPad(priv)) - return xf86WcmSetPadCoreMode(local); - - if (value) + if (value != is_absolute) { - priv->flags |= ABSOLUTE_FLAG; - xf86ReplaceStrOption(local->options, "Mode", "Absolute"); - xf86WcmInitialCoordinates(local, 0); - xf86WcmInitialCoordinates(local, 1); - } - else - { - priv->flags &= ~ABSOLUTE_FLAG; - xf86ReplaceStrOption(local->options, "Mode", "Relative"); - xf86WcmInitialCoordinates(local, 0); - xf86WcmInitialCoordinates(local, 1); + xf86WcmDevSwitchModeCall(local, value); } break; } @@ -259,27 +330,29 @@ xf86WcmSetParam (local, XWACOM_PARAM_BOTTOMY, common->wcmMaxY); break; case XWACOM_PARAM_MMT: - if ((value != 0) && (value != 1)) return BadValue; - common->wcmMMonitor = value; - if (value) - { - xf86ReplaceStrOption(local->options, "MMonitor", "on"); - } - else + if ((value != 0) && (value != 1)) + return BadValue; + else if (priv->wcmMMonitor != value) { - xf86ReplaceStrOption(local->options, "MMonitor", "off"); + priv->wcmMMonitor = value; + if (value) + xf86ReplaceStrOption(local->options, "MMonitor", "on"); + else + xf86ReplaceStrOption(local->options, "MMonitor", "off"); + + xf86WcmMappingFactor(local); } break; case XWACOM_PARAM_TPCBUTTON: - if ((value != 0) && (value != 1)) return BadValue; - priv->common->wcmTPCButton = value; - if (value) - { - xf86ReplaceStrOption(local->options, "TPCButton", "on"); - } - else + if ((value != 0) && (value != 1)) + return BadValue; + else if (common->wcmTPCButton != value) { - xf86ReplaceStrOption(local->options, "TPCButton", "off"); + common->wcmTPCButton = value; + if (value) + xf86ReplaceStrOption(local->options, "TPCButton", "on"); + else + xf86ReplaceStrOption(local->options, "TPCButton", "off"); } break; case XWACOM_PARAM_CURSORPROX: @@ -287,38 +360,19 @@ { if ((value > 255) || (value < 0)) return BadValue; - xf86ReplaceIntOption(local->options, "CursorProx",value); - common->wcmCursorProxoutDist = value; + else if (common->wcmCursorProxoutDist != value) + { + xf86ReplaceIntOption(local->options, "CursorProx",value); + common->wcmCursorProxoutDist = value; + } } break; case XWACOM_PARAM_SCREEN_NO: - if ( (priv->twinview == TV_NONE && - screenInfo.numScreens == 1) - || value < -1 || - (priv->twinview == TV_NONE && - value >= screenInfo.numScreens) - || (priv->twinview != TV_NONE - && value > 1) ) + if (value < -1 || value >= priv->numScreen) return BadValue; else if (priv->screen_no != value) { - priv->screen_no = value; - if (priv->twinview != TV_NONE) - { - if (priv->screen_no == -1) - { - if (priv->twinview == TV_LEFT_RIGHT) - priv->tvoffsetX = 60; - else - priv->tvoffsetY = 60; - } - else - { - priv->tvoffsetX = 0; - priv->tvoffsetY = 0; - } - } - xf86ReplaceIntOption(local->options, "ScreenNo", value); + xf86WcmChangeScreen(local, value); } break; case XWACOM_PARAM_TWINVIEW: @@ -327,20 +381,7 @@ if ((value > 2) || (value < 0) || screenInfo.numScreens != 1) return BadValue; priv->twinview = value; - switch(value) { - case TV_NONE: - xf86ReplaceStrOption(local->options, "TwinView", "None"); - break; - case TV_ABOVE_BELOW: - xf86ReplaceStrOption(local->options, "TwinView", "Vertical"); - break; - case TV_LEFT_RIGHT: - xf86ReplaceStrOption(local->options, "TwinView", "Horizontal"); - break; - default: - return BadValue; - } - xf86WcmInitialTVScreens(local); + xf86WcmChangeScreen(local, priv->screen_no); } break; case XWACOM_PARAM_TVRESOLUTION0: @@ -356,6 +397,7 @@ { rX = priv->tvResolution[0]; rY = priv->tvResolution[1]; + sNum++; } else { @@ -377,6 +419,7 @@ return BadValue; priv->tvResolution[sNum++] = value & 0xffff; priv->tvResolution[sNum] = (value >> 16) & 0xffff; + xf86WcmChangeScreen(local, priv->screen_no); DBG(10, priv->debugLevel, ErrorF("xf86WcmSetParam " "to ResX=%d ResY=%d \n", value & 0xffff, (value >> 16) & 0xffff)); @@ -487,6 +530,8 @@ break; } + xf86WcmInitialScreens(tmppriv->local); + xf86WcmMappingFactor(tmppriv->local); xf86WcmInitialCoordinates(tmppriv->local, 0); xf86WcmInitialCoordinates(tmppriv->local, 1); @@ -522,14 +567,18 @@ return BadValue; else { - if ((!(value & AC_TYPE)) && (value != priv->button[bn])) + if (((value & AC_TYPE) == AC_BUTTON) && (value != priv->button[bn]) && !number_keys ) { + /* assign button */ snprintf (st, sizeof (st), "Button%d", bn); xf86ReplaceIntOption (local->options, st, value); priv->button[bn] = xf86SetIntOption (local->options, st, bn); + } + else + { + setVal = &(priv->button [bn]); + keyP = priv->keys[bn]; } - setVal = &(priv->button [bn]); - keyP = priv->keys[bn]; } } @@ -568,6 +617,7 @@ keyP = priv->srdnk; break; } + /* assign keys */ if (keyP) { if (!number_keys) @@ -575,8 +625,8 @@ *setVal = value; number_keys = (value & AC_NUM_KEYS) >> 20; DBG(10, priv->debugLevel, ErrorF( - "xf86WcmSetButtonParam value = %x number" - " of keys = %d\n", *setVal, number_keys)); + "xf86WcmSetButtonParam value = %x number" + " of keys = %d\n", *setVal, number_keys)); if (number_keys) keyP[button_keys++] = value & 0xffff; } @@ -586,6 +636,9 @@ { keyP[button_keys++] = value & 0xffff; keyP[button_keys++] = (value & 0xffff0000) >> 16; + DBG(10, priv->debugLevel, ErrorF( + "xf86WcmSetButtonParam got %d values = %x \n", + button_keys, value)); } } if (button_keys >= number_keys) @@ -709,10 +762,7 @@ case XWACOM_PARAM_STOPX7: { int sn = (param - XWACOM_PARAM_STOPX0) / 4; - int numS = screenInfo.numScreens; - if (priv->twinview != TV_NONE) - numS = 2; - if (sn >= numS) + if (sn >= priv->numScreen) return -1; else return priv->screenTopX[sn]; @@ -727,10 +777,7 @@ case XWACOM_PARAM_STOPY7: { int sn = (param - XWACOM_PARAM_STOPY0) / 4; - int numS = screenInfo.numScreens; - if (priv->twinview != TV_NONE) - numS = 2; - if (sn >= numS) + if (sn >= priv->numScreen) return -1; else return priv->screenTopY[sn]; @@ -745,10 +792,7 @@ case XWACOM_PARAM_SBOTTOMX7: { int sn = (param - XWACOM_PARAM_SBOTTOMX0) / 4; - int numS = screenInfo.numScreens; - if (priv->twinview != TV_NONE) - numS = 2; - if (sn >= numS) + if (sn >= priv->numScreen) return -1; else return priv->screenBottomX[sn]; @@ -763,10 +807,7 @@ case XWACOM_PARAM_SBOTTOMY7: { int sn = (param - XWACOM_PARAM_SBOTTOMY0) / 4; - int numS = screenInfo.numScreens; - if (priv->twinview != TV_NONE) - numS = 2; - if (sn >= numS) + if (sn >= priv->numScreen) return -1; else return priv->screenBottomY[sn]; @@ -806,7 +847,7 @@ case XWACOM_PARAM_XYDEFAULT: return -1; case XWACOM_PARAM_MMT: - return common->wcmMMonitor; + return priv->wcmMMonitor; case XWACOM_PARAM_TPCBUTTON: return common->wcmTPCButton; case XWACOM_PARAM_CURSORPROX: @@ -835,10 +876,7 @@ case XWACOM_PARAM_SCREEN_NO: return priv->screen_no; case XWACOM_PARAM_NUMSCREEN: - if (priv->twinview == TV_NONE) - return screenInfo.numScreens; - else - return 2; + return priv->numScreen; } DBG(10, priv->debugLevel, ErrorF("xf86WcmGetParam invalid param %d\n", param)); return -1; @@ -851,10 +889,7 @@ static int xf86WcmGetDefaultScreenInfo(LocalDevicePtr local, int param) { WacomDevicePtr priv = (WacomDevicePtr)local->private; - int numS = screenInfo.numScreens, i = 0; - - if (priv->twinview != TV_NONE) - numS = 2; + int numS = priv->numScreen; switch (param) { @@ -870,17 +905,8 @@ int sn = (param - XWACOM_PARAM_STOPX0) / 4; if (sn >= numS) return -1; - else if (priv->twinview == TV_ABOVE_BELOW) - return 0; - else if (priv->twinview == TV_LEFT_RIGHT) - return (sn ? priv->tvResolution[0] : 0); else - { - int x = 0; - for (i = 0; iwidth; - return x; - } + return priv->screenTopX[sn]; } case XWACOM_PARAM_STOPY0: case XWACOM_PARAM_STOPY1: @@ -894,17 +920,8 @@ int sn = (param - XWACOM_PARAM_STOPY0) / 4; if (sn >= numS) return -1; - else if (priv->twinview == TV_ABOVE_BELOW) - return (sn ? priv->tvResolution[1] : 0); - else if (priv->twinview == TV_LEFT_RIGHT) - return 0; else - { - int y = 0; - for (i = 0; iheight; - return y; - } + return priv->screenTopY[sn]; } case XWACOM_PARAM_SBOTTOMX0: case XWACOM_PARAM_SBOTTOMX1: @@ -918,10 +935,8 @@ int sn = (param - XWACOM_PARAM_SBOTTOMX0) / 4; if (sn >= numS) return -1; - else if (priv->twinview != TV_NONE) - return (sn ? priv->tvResolution[2] : priv->tvResolution[0]); else - return screenInfo.screens[i]->width; + return priv->screenBottomX[sn]; } case XWACOM_PARAM_SBOTTOMY0: case XWACOM_PARAM_SBOTTOMY1: @@ -935,12 +950,11 @@ int sn = (param - XWACOM_PARAM_SBOTTOMY0) / 4; if (sn >= numS) return -1; - else if (priv->twinview != TV_NONE) - return (sn ? priv->tvResolution[3] : priv->tvResolution[1]); else - return screenInfo.screens[i]->height; + return priv->screenBottomY[sn]; } } + DBG(10, priv->debugLevel, ErrorF("xf86WcmGetDefaultScreenInfo invalid param %d\n", param)); return -1; } @@ -957,6 +971,9 @@ if ( param >= XWACOM_PARAM_STOPX0 && param <= XWACOM_PARAM_SBOTTOMY2) return xf86WcmGetDefaultScreenInfo(local, param); + if (param >= XWACOM_PARAM_BUTTON6 && param <= XWACOM_PARAM_BUTTON32) + return 0; + switch (param) { case XWACOM_PARAM_TOPX: @@ -1016,49 +1033,7 @@ DBG(10, priv->debugLevel, ErrorF("xf86WcmGetDefaultParam invalid param %d\n",param)); return -1; } - -/***************************************************************************** -* xf86WcmDevSwitchMode -- -*****************************************************************************/ - -int xf86WcmDevSwitchMode(ClientPtr client, DeviceIntPtr dev, int mode) -{ - LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate; - WacomDevicePtr priv = (WacomDevicePtr)local->private; - int is_absolute = priv->flags & ABSOLUTE_FLAG; - - DBG(3, priv->debugLevel, ErrorF("xf86WcmSwitchMode dev=%p mode=%d\n", (void *)dev, mode)); - - /* Pad is always in relative mode when it's a core device. - * Always in absolute mode when it is not a core device. - */ - if (IsPad(priv)) - return xf86WcmSetPadCoreMode(local); - - if ((mode == Absolute) && !is_absolute) - { - priv->flags |= ABSOLUTE_FLAG; - xf86ReplaceStrOption(local->options, "Mode", "Absolute"); - xf86WcmInitialCoordinates(local, 0); - xf86WcmInitialCoordinates(local, 1); - } - else if ((mode == Relative) && is_absolute) - { - priv->flags &= ~ABSOLUTE_FLAG; - xf86ReplaceStrOption(local->options, "Mode", "Relative"); - xf86WcmInitialCoordinates(local, 0); - xf86WcmInitialCoordinates(local, 1); - } - else if ( (mode != Absolute) && (mode != Relative)) - { - DBG(10, priv->debugLevel, ErrorF("xf86WcmSwitchMode dev=%p invalid mode=%d\n", - (void *)dev, mode)); - return BadMatch; - } - - return Success; -} - + /***************************************************************************** * xf86WcmDevChangeControl -- ****************************************************************************/ @@ -1135,4 +1110,3 @@ r [i] = local->dev->valuator->axes [i].resolution; return rc; } - diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/xdrv/xf86Wacom.c /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/xdrv/xf86Wacom.c --- wacom-tools-0.7.9.3/linuxwacom/src/xdrv/xf86Wacom.c 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/xdrv/xf86Wacom.c 2008-02-29 18:58:44.000000000 -0500 @@ -1,6 +1,6 @@ /* * Copyright 1995-2002 by Frederic Lepied, France. - * Copyright 2002-2007 by Ping Cheng, Wacom Technology. + * Copyright 2002-2008 by Ping Cheng, Wacom Technology. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -31,8 +31,11 @@ * Frederic Lepied , * Brion Vibber , * Aaron Optimizer Digulla , - * Jonathan Layes . - * John Joganic + * Jonathan Layes , + * John Joganic . + * + * Support for hot plug-n-play by + * Magnus Vigerlöf . */ /* @@ -58,9 +61,14 @@ * 2007-06-25 47-pc0.7.8 - new release * 2007-10-25 47-pc0.7.9-1 - Support multimonitors in both horizonal and vertical settings * 2007-11-21 47-pc0.7.9-3 - Updated TwinView screen switch offset + * 2007-12-07 47-pc0.7.9-4 - Support Cintiq 12WX and Bamboo + * 2007-12-20 47-pc0.7.9-5 - multimonitor support update + * 2008-01-08 47-pc0.7.9-6 - Configure script change for Xorg 7.3 support + * 2008-01-17 47-pc0.7.9-7 - Preparing for hotplug-aware driver + * 2008-02-27 47-pc0.7.9-8 - Support Cintiq 20 */ -static const char identification[] = "$Identification: 47-0.7.9-3 $"; +static const char identification[] = "$Identification: 47-0.7.9-8 $"; /****************************************************************************/ @@ -80,6 +88,7 @@ extern int usbWcmGetRanges(LocalDevicePtr local); extern int xf86WcmDevChangeControl(LocalDevicePtr local, xDeviceCtl* control); extern int xf86WcmDevSwitchMode(ClientPtr client, DeviceIntPtr dev, int mode); +extern void xf86WcmInitialScreens(LocalDevicePtr local); WacomModule gWacomModule = { @@ -98,12 +107,15 @@ xf86WcmDevReverseConvert, }; +static void xf86WcmKbdLedCallback(DeviceIntPtr di, LedCtrl * lcp) +{ +} + static int xf86WcmInitArea(LocalDevicePtr local) { WacomDevicePtr priv = (WacomDevicePtr)local->private; WacomToolAreaPtr area = priv->toolarea, inlist; WacomCommonPtr common = priv->common; - int totalWidth = 0, maxHeight = 0; double screenRatio, tabletRatio; DBG(10, priv->debugLevel, ErrorF("xf86WcmInitArea\n")); @@ -133,6 +145,9 @@ area->bottomY = priv->bottomY = common->wcmMaxY; } + if (priv->twinview != TV_NONE) + priv->numScreen = 2; + if (priv->screen_no != -1 && (priv->screen_no >= priv->numScreen || priv->screen_no < 0)) { @@ -144,48 +159,16 @@ } } - /* Calculate the ratio according to KeepShape, TopX and TopY */ - if (priv->screen_no != -1) - { - priv->currentScreen = priv->screen_no; - if (priv->twinview == TV_NONE) - { - totalWidth = screenInfo.screens[priv->currentScreen]->width; - maxHeight = screenInfo.screens[priv->currentScreen]->height; - } - else - { - totalWidth = priv->tvResolution[2*priv->currentScreen]; - maxHeight = priv->tvResolution[2*priv->currentScreen+1]; - } - } - else - { - int i; - for (i = 0; i < priv->numScreen; i++) - { - totalWidth += screenInfo.screens[i]->width; - if (maxHeight < screenInfo.screens[i]->height) - maxHeight=screenInfo.screens[i]->height; - } - } - - if (priv->numScreen == 1) - { - priv->factorX = totalWidth - / (double)(priv->bottomX - priv->topX - 2*priv->tvoffsetX); - priv->factorY = maxHeight - / (double)(priv->bottomY - priv->topY - 2*priv->tvoffsetY); - DBG(2, priv->debugLevel, ErrorF("X factor = %.3g, Y factor = %.3g\n", - priv->factorX, priv->factorY)); - } + /* need maxWidth and maxHeight for keepshape */ + xf86WcmMappingFactor(local); /* Maintain aspect ratio */ if (priv->flags & KEEP_SHAPE_FLAG) { - screenRatio = totalWidth / (double)maxHeight; - tabletRatio = ((double)(common->wcmMaxX - priv->topX)) / - (common->wcmMaxY - priv->topY); + + screenRatio = ((double)priv->maxWidth / (double)priv->maxHeight); + tabletRatio = ((double)(common->wcmMaxX - priv->topX) / + (double)(common->wcmMaxY - priv->topY)); DBG(2, priv->debugLevel, ErrorF("screenRatio = %.3g, " "tabletRatio = %.3g\n", screenRatio, tabletRatio)); @@ -202,6 +185,8 @@ screenRatio / tabletRatio + priv->topX; area->bottomY = priv->bottomY = common->wcmMaxY; } + /* active tablet size has been changed */ + xf86WcmMappingFactor(local); } /* end keep shape */ @@ -258,6 +243,7 @@ WacomDevicePtr priv = (WacomDevicePtr)local->private; WacomCommonPtr common = priv->common; int tabletSize = 0, topx = 0, topy = 0; + int resolution; /* x ax */ if ( !axes ) @@ -272,18 +258,20 @@ tabletSize = priv->bottomX - priv->topX; } if (priv->flags & ABSOLUTE_FLAG) - topx = priv->topX; + topx = priv->topX - priv->tvoffsetX; -#if defined WCM_XORG && GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 0 + resolution = common->wcmResolX; +#ifdef WCM_XORG_TABLET_SCALING /* Ugly hack for Xorg 7.3, which doesn't call xf86WcmDevConvert * for coordinate conversion at the moment */ if (priv->flags & ABSOLUTE_FLAG) tabletSize -= topx; topx = 0; tabletSize = (int)((double)tabletSize * priv->factorX + 0.5); + resolution = (int)((double)resolution * priv->factorX + 0.5); #endif InitValuatorAxisStruct(local->dev, 0, topx, tabletSize, - common->wcmResolX, 0, common->wcmResolX); + resolution, 0, resolution); } else /* y ax */ { @@ -297,127 +285,20 @@ tabletSize = priv->bottomY - priv->topY; } if (priv->flags & ABSOLUTE_FLAG) - topy = priv->topY; + topy = priv->topY - priv->tvoffsetY; -#if defined WCM_XORG && GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 0 + resolution = common->wcmResolY; +#ifdef WCM_XORG_TABLET_SCALING /* Ugly hack for Xorg 7.3, which doesn't call xf86WcmDevConvert * for coordinate conversion at the moment */ if (priv->flags & ABSOLUTE_FLAG) tabletSize -= topy; topy = 0; tabletSize = (int)((double)tabletSize * priv->factorY + 0.5); + resolution = (int)((double)resolution * priv->factorY + 0.5); #endif InitValuatorAxisStruct(local->dev, 1, topy, tabletSize, - common->wcmResolY, 0, common->wcmResolY); - } -} - -/***************************************************************************** - * xf86WcmInitialTVScreens - ****************************************************************************/ - -void xf86WcmInitialTVScreens(LocalDevicePtr local) -{ - WacomDevicePtr priv = (WacomDevicePtr)local->private; - - priv->tvoffsetX = 0; - priv->tvoffsetY = 0; - if (priv->twinview == TV_NONE) - return; - - if (priv->twinview == TV_LEFT_RIGHT) - { - if (priv->screen_no == -1) - priv->tvoffsetX = 60; - - /* default resolution */ - if(!priv->tvResolution[0]) - { - priv->tvResolution[0] = screenInfo.screens[0]->width/2; - priv->tvResolution[1] = screenInfo.screens[0]->height; - priv->tvResolution[2] = priv->tvResolution[0]; - priv->tvResolution[3] = priv->tvResolution[1]; - } - } - else if (priv->twinview == TV_ABOVE_BELOW) - { - if (priv->screen_no == -1) - priv->tvoffsetY = 60; - - if(!priv->tvResolution[0]) - { - priv->tvResolution[0] = screenInfo.screens[0]->width; - priv->tvResolution[1] = screenInfo.screens[0]->height/2; - priv->tvResolution[2] = priv->tvResolution[0]; - priv->tvResolution[3] = priv->tvResolution[1]; - } - } - - /* initial screen info */ - priv->screenTopX[0] = 0; - priv->screenTopY[0] = 0; - priv->screenBottomX[0] = priv->tvResolution[0]; - priv->screenBottomY[0] = priv->tvResolution[1]; - if (priv->twinview == TV_ABOVE_BELOW) - { - priv->screenTopX[1] = 0; - priv->screenTopY[1] = priv->tvResolution[1]; - priv->screenBottomX[1] = priv->tvResolution[2]; - priv->screenBottomY[1] = priv->tvResolution[1] + priv->tvResolution[3]; - } - if (priv->twinview == TV_LEFT_RIGHT) - { - priv->screenTopX[1] = priv->tvResolution[0]; - priv->screenTopY[1] = 0; - priv->screenBottomX[1] = priv->tvResolution[0] + priv->tvResolution[2]; - priv->screenBottomY[1] = priv->tvResolution[3]; - } - - DBG(10, priv->debugLevel, ErrorF("xf86WcmInitialTVScreens for \"%s\" " - "topX0=%d topY0=%d bottomX0=%d bottomY0=%d " - "topX1=%d topY1=%d bottomX1=%d bottomY1=%d \n", - local->name, priv->screenTopX[0], priv->screenTopY[0], - priv->screenBottomX[0], priv->screenBottomY[0], - priv->screenTopX[1], priv->screenTopY[1], - priv->screenBottomX[1], priv->screenBottomY[1])); -} - -/***************************************************************************** - * xf86WcmInitialScreens - ****************************************************************************/ - -void xf86WcmInitialScreens(LocalDevicePtr local) -{ - WacomDevicePtr priv = (WacomDevicePtr)local->private; - int i; - - if (priv->twinview != TV_NONE) - return; - - /* initial screen info */ - priv->screenTopX[0] = 0; - priv->screenTopY[0] = 0; - priv->screenBottomX[0] = 0; - priv->screenBottomY[0] = 0; - for (i=0; iscreenTopX[i] = dixScreenOrigins[i].x; - priv->screenTopY[i] = dixScreenOrigins[i].y; - priv->screenBottomX[i] = dixScreenOrigins[i].x; - priv->screenBottomY[i] = dixScreenOrigins[i].y; -#endif - priv->screenBottomX[i] += screenInfo.screens[i]->width; - priv->screenBottomY[i] += screenInfo.screens[i]->height; - -#if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - priv->screenTopX[i] = priv->screenBottomX[i]; - priv->screenTopY[i] = priv->screenBottomY[i]; -#endif - DBG(10, priv->debugLevel, ErrorF("xf86WcmInitialScreens for \"%s\" " - "topX[%d]=%d topY[%d]=%d bottomX[%d]=%d bottomY[%d]=%d \n", - local->name, i, priv->screenTopX[i], i, priv->screenTopY[i], - i, priv->screenBottomX[i], i, priv->screenBottomY[i])); + resolution, 0, resolution); } } @@ -430,7 +311,7 @@ { WacomDevicePtr priv = (WacomDevicePtr)local->private; WacomCommonPtr common = priv->common; - CARD8 butmap[MAX_BUTTONS]; + CARD8 butmap[MAX_BUTTONS+1]; int nbaxes, nbbuttons, nbkeys; int loop; @@ -450,6 +331,9 @@ IsPad(priv) ? "pad" : "eraser", nbbuttons, nbkeys, nbaxes)); + /* initialize screen bounding rect */ + xf86WcmInitialScreens(local); + if (xf86WcmInitArea(local) == FALSE) { return FALSE; @@ -503,41 +387,50 @@ } - if (nbkeys) + /* only initial KeyClass and LedFeedbackClass once */ + if (!priv->wcmInitKeyClassCount) { - KeySymsRec wacom_keysyms; - KeySym keymap[256]; + if (nbkeys) + { + KeySymsRec wacom_keysyms; + KeySym keymap[256]; - for (loop = 0; loop < nbkeys; loop++) - if ((priv->button [loop] & AC_TYPE) == AC_KEY) - keymap [loop] = priv->button [loop] & AC_CODE; - else + for (loop = 0; loop < nbkeys; loop++) + if ((priv->button [loop] & AC_TYPE) == AC_KEY) + keymap [loop] = priv->button [loop] & AC_CODE; + else + keymap [loop] = NoSymbol; + for(loop = nbkeys; loop<256; loop++) keymap [loop] = NoSymbol; - for(loop = nbkeys; loop<256; loop++) - keymap [loop] = NoSymbol; - /* There seems to be a long-standing misunderstanding about - * how a keymap should be defined. All tablet drivers from - * stock X11 source tree are doing it wrong: they leave first - * 8 keysyms as VoidSymbol's, and are passing 8 as minimum - * key code. But if you look at SetKeySymsMap() from - * programs/Xserver/dix/devices.c you will see that - * Xserver does not require first 8 keysyms; it supposes - * that the map begins at minKeyCode. - * - * It could be that this assumption is a leftover from - * earlier XFree86 versions, but that's out of our scope. - * This also means that no keys on extended input devices - * with their own keycodes (e.g. tablets) were EVER used. - */ - wacom_keysyms.map = keymap; - /* minKeyCode = 8 because this is the min legal key code */ - wacom_keysyms.minKeyCode = 8; - wacom_keysyms.maxKeyCode = 255; - wacom_keysyms.mapWidth = 1; - if (InitKeyClassDeviceStruct(local->dev, &wacom_keysyms, NULL) == FALSE) - { - ErrorF("unable to init key class device\n"); + /* There seems to be a long-standing misunderstanding about + * how a keymap should be defined. All tablet drivers from + * stock X11 source tree are doing it wrong: they leave first + * 8 keysyms as VoidSymbol's, and are passing 8 as minimum + * key code. But if you look at SetKeySymsMap() from + * programs/Xserver/dix/devices.c you will see that + * Xserver does not require first 8 keysyms; it supposes + * that the map begins at minKeyCode. + * + * It could be that this assumption is a leftover from + * earlier XFree86 versions, but that's out of our scope. + * This also means that no keys on extended input devices + * with their own keycodes (e.g. tablets) were EVER used. + */ + wacom_keysyms.map = keymap; + /* minKeyCode = 8 because this is the min legal key code */ + wacom_keysyms.minKeyCode = 8; + wacom_keysyms.maxKeyCode = 255; + wacom_keysyms.mapWidth = 1; + if (InitKeyClassDeviceStruct(local->dev, &wacom_keysyms, NULL) == FALSE) + { + ErrorF("unable to init key class device\n"); + return FALSE; + } + } + + if(InitLedFeedbackClassDeviceStruct (local->dev, xf86WcmKbdLedCallback) == FALSE) { + ErrorF("unable to init led feedback device struct\n"); return FALSE; } } @@ -547,12 +440,6 @@ xf86MotionHistoryAllocate(local); #endif - /* initialize screen bounding rect */ - if (priv->twinview != TV_NONE) - xf86WcmInitialTVScreens(local); - else - xf86WcmInitialScreens(local); - /* x */ xf86WcmInitialCoordinates(local, 0); @@ -811,11 +698,13 @@ */ case DEVICE_INIT: priv->wcmDevOpenCount = 0; + priv->wcmInitKeyClassCount = 0; if (!xf86WcmDevOpen(pWcm)) { DBG(1, priv->debugLevel, ErrorF("xf86WcmProc INIT FAILED\n")); return !Success; } + priv->wcmInitKeyClassCount++; priv->wcmDevOpenCount++; break; @@ -854,7 +743,8 @@ /***************************************************************************** * xf86WcmDevConvert -- * Convert X & Y valuators so core events can be generated with - * coordinates that are scaled and suitable for screen resolution. ****************************************************************************/ + * coordinates that are scaled and suitable for screen resolution. + ****************************************************************************/ static Bool xf86WcmDevConvert(LocalDevicePtr local, int first, int num, int v0, int v1, int v2, int v3, int v4, int v5, int* x, int* y) @@ -862,7 +752,8 @@ WacomDevicePtr priv = (WacomDevicePtr) local->private; double temp; - DBG(6, priv->debugLevel, ErrorF("xf86WcmDevConvert v0=%d v1=%d \n", v0, v1)); + DBG(6, priv->debugLevel, ErrorF("xf86WcmDevConvert v0=%d v1=%d on screen %d \n", + v0, v1, priv->currentScreen)); if (first != 0 || num == 1) return FALSE; @@ -872,94 +763,26 @@ if (priv->flags & ABSOLUTE_FLAG) { + int leftPadding = 0; + int topPadding = 0; + + v0 = v0 - priv->topX - priv->tvoffsetX; + v1 = v1 - priv->topY - priv->tvoffsetY; + if (priv->twinview == TV_NONE) { - v0 = v0 > priv->bottomX ? priv->bottomX - priv->topX : - v0 < priv->topX ? 0 : v0 - priv->topX; - v1 = v1 > priv->bottomY ? priv->bottomY - priv->topY : - v1 < priv->topY ? 0 : v1 - priv->topY; - - if (priv->common->wcmMMonitor) + if (priv->screen_no == -1) { - int i, totalWidth, leftPadding = 0; - if (priv->screen_no == -1) - { - for (i = 0; i < priv->currentScreen; i++) - leftPadding += screenInfo.screens[i]->width; - for (totalWidth = leftPadding; i < priv->numScreen; i++) - totalWidth += screenInfo.screens[i]->width; - } - else - { - leftPadding = 0; - totalWidth = screenInfo.screens[priv->currentScreen]->width; - } - v0 -= (priv->bottomX - priv->topX) * leftPadding - / (double)totalWidth + 0.5; + leftPadding = priv->screenTopX[priv->currentScreen]; + topPadding = priv->screenTopY[priv->currentScreen]; } + *x = - leftPadding; + *y = - topPadding; } else { - v0 -= priv->topX - priv->tvoffsetX; - v1 -= priv->topY - priv->tvoffsetY; - if (priv->twinview == TV_LEFT_RIGHT) - { - if (v0 > priv->bottomX - priv->tvoffsetX && priv->screen_no == -1) - { - if (priv->currentScreen == 0) - v0 = priv->bottomX - priv->tvoffsetX; - else - { - v0 -= priv->bottomX - priv->topX - 2*priv->tvoffsetX; - if (v0 > priv->bottomX - priv->tvoffsetX) - v0 = 2*(priv->bottomX - priv->tvoffsetX) - v0; - } - } - if (priv->currentScreen == 1) - { - *x = priv->tvResolution[0] + priv->tvResolution[2] - * v0 / (priv->bottomX - priv->topX - 2*priv->tvoffsetX); - *y = v1 * priv->tvResolution[3] / - (priv->bottomY - priv->topY - 2*priv->tvoffsetY) + 0.5; - } - else - { - *x = priv->tvResolution[0] * v0 - / (priv->bottomX - priv->topX - 2*priv->tvoffsetX); - *y = v1 * priv->tvResolution[1] / - (priv->bottomY - priv->topY - 2*priv->tvoffsetY) + 0.5; - } - } - if (priv->twinview == TV_ABOVE_BELOW) - { - if (v1 > priv->bottomY - priv->tvoffsetY && priv->screen_no == -1) - { - if (priv->currentScreen == 0) - v1 = priv->bottomY - priv->tvoffsetY; - else - { - v1 -= priv->bottomY - priv->topY - 2*priv->tvoffsetY; - if (v1 > priv->bottomY - priv->tvoffsetY) - v1 = 2*(priv->bottomY - priv->tvoffsetY) - v1; - } - } - if (priv->currentScreen == 1) - { - *x = v0 * priv->tvResolution[2] / - (priv->bottomX - priv->topX - 2*priv->tvoffsetX) + 0.5; - *y = priv->tvResolution[1] + - priv->tvResolution[3] * v1 / - (priv->bottomY - priv->topY - 2*priv->tvoffsetY); - } - else - { - *x = v0 * priv->tvResolution[0] / - (priv->bottomX - priv->topX - 2*priv->tvoffsetX) + 0.5; - *y = priv->tvResolution[1] * v1 / - (priv->bottomY - priv->topY - 2*priv->tvoffsetY); - } - } - return TRUE; + *x = priv->screenTopX[priv->currentScreen]; + *y = priv->screenTopY[priv->currentScreen]; } } temp = ((double)v0 * priv->factorX + 0.5); @@ -967,7 +790,30 @@ temp = ((double)v1 * priv->factorY + 0.5); *y += temp; - DBG(6, priv->debugLevel, ErrorF("Wacom converted v0=%d v1=%d to x=%d y=%d\n", v0, v1, *x, *y)); + DBG(6, priv->debugLevel, ErrorF("xf86WcmDevConvert v0=%d v1=%d to x=%d y=%d\n", v0, v1, *x, *y)); + if ((priv->screen_no != -1 || !priv->wcmMMonitor) && (priv->flags & ABSOLUTE_FLAG)) + { + DBG(6, priv->debugLevel, ErrorF("xf86WcmDevConvert restricted (%d,%d)", *x, *y)); + if (priv->twinview == TV_NONE) + { + if (*x < 1) *x = 0; + if (*y < 1) *y = 0; + if (*x >= priv->screenBottomX[priv->currentScreen] - priv->screenTopX[priv->currentScreen]) + *x = priv->screenBottomX[priv->currentScreen] - priv->screenTopX[priv->currentScreen]-1; + if (*y >= priv->screenBottomY[priv->currentScreen] - priv->screenTopY[priv->currentScreen]) + *y = priv->screenBottomY[priv->currentScreen] - priv->screenTopY[priv->currentScreen]-1; + } + else + { + if (*x < priv->screenTopX[priv->currentScreen]+1) *x = priv->screenTopX[priv->currentScreen]; + if (*y < priv->screenTopY[priv->currentScreen]+1) *y = priv->screenTopY[priv->currentScreen]; + if (*x >= priv->screenBottomX[priv->currentScreen]) + *x = priv->screenBottomX[priv->currentScreen]-1; + if (*y >= priv->screenBottomY[priv->currentScreen]) + *y = priv->screenBottomY[priv->currentScreen]-1; + } + DBG(6, priv->debugLevel, ErrorF(" to x=%d y=%d\n", *x, *y)); + } return TRUE; } @@ -975,7 +821,8 @@ * xf86WcmDevReverseConvert -- * Convert X and Y to valuators in relative mode where the position of * the core pointer must be translated into device cootdinates before - * the extension and core events are generated in Xserver. ****************************************************************************/ + * the extension and core events are generated in Xserver. + ****************************************************************************/ static Bool xf86WcmDevReverseConvert(LocalDevicePtr local, int x, int y, int* valuators) diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/xdrv/xf86WacomDefs.h /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/xdrv/xf86WacomDefs.h --- wacom-tools-0.7.9.3/linuxwacom/src/xdrv/xf86WacomDefs.h 1969-12-31 19:00:00.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/xdrv/xf86WacomDefs.h 2008-02-29 18:58:44.000000000 -0500 @@ -0,0 +1,443 @@ +/* + * Copyright 1995-2002 by Frederic Lepied, France. + * Copyright 2002-2008 by Ping Cheng, Wacom Technology. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __XF86_XF86WACOMDEFS_H +#define __XF86_XF86WACOMDEFS_H + +/***************************************************************************** + * General Defines + ****************************************************************************/ +#ifdef WCM_ENABLE_LINUXINPUT +#include +#include +#define MAX_USB_EVENTS 32 +#endif /* WCM_ENABLE_LINUXINPUT */ + +#define DEFAULT_SPEED 1.0 /* default relative cursor speed */ +#define MAX_ACCEL 7 /* number of acceleration levels */ +#define DEFAULT_SUPPRESS 2 /* default suppress */ +#define MAX_SUPPRESS 100 /* max value of suppress */ +#define BUFFER_SIZE 256 /* size of reception buffer */ +#define MAXTRY 3 /* max number of try to receive magic number */ + +/* Default max distance to the tablet at which a proximity-out event is generated for + * cursor device (e.g. mouse). + */ +#define PROXOUT_INTUOS_DISTANCE 10 +#define PROXOUT_GRAPHIRE_DISTANCE 42 + +#define HEADER_BIT 0x80 +#define ZAXIS_SIGN_BIT 0x40 +#define ZAXIS_BIT 0x04 +#define ZAXIS_BITS 0x3F +#define POINTER_BIT 0x20 +#define PROXIMITY_BIT 0x40 +#define BUTTON_FLAG 0x08 +#define BUTTONS_BITS 0x78 +#define TILT_SIGN_BIT 0x40 +#define TILT_BITS 0x3F + +/* defines to discriminate second side button and the eraser */ +#define ERASER_PROX 4 +#define OTHER_PROX 1 + +/****************************************************************************** + * Forward Declarations + *****************************************************************************/ + +typedef struct _WacomModel WacomModel, *WacomModelPtr; +typedef struct _WacomDeviceRec WacomDeviceRec, *WacomDevicePtr; +typedef struct _WacomDeviceState WacomDeviceState, *WacomDeviceStatePtr; +typedef struct _WacomChannel WacomChannel, *WacomChannelPtr; +typedef struct _WacomCommonRec WacomCommonRec, *WacomCommonPtr; +typedef struct _WacomFilterState WacomFilterState, *WacomFilterStatePtr; +typedef struct _WacomDeviceClass WacomDeviceClass, *WacomDeviceClassPtr; +typedef struct _WacomTool WacomTool, *WacomToolPtr; +typedef struct _WacomToolArea WacomToolArea, *WacomToolAreaPtr; + +/****************************************************************************** + * WacomModel - model-specific device capabilities + *****************************************************************************/ + +struct _WacomModel +{ + const char* name; + + void (*Initialize)(WacomCommonPtr common, const char* id, float version); + void (*GetResolution)(LocalDevicePtr local); + int (*GetRanges)(LocalDevicePtr local); + int (*Reset)(LocalDevicePtr local); + int (*EnableTilt)(LocalDevicePtr local); + int (*EnableSuppress)(LocalDevicePtr local); + int (*SetLinkSpeed)(LocalDevicePtr local); + int (*Start)(LocalDevicePtr local); + int (*Parse)(LocalDevicePtr local, const unsigned char* data); + int (*FilterRaw)(WacomCommonPtr common, WacomChannelPtr pChannel, + WacomDeviceStatePtr ds); + int (*DetectConfig)(LocalDevicePtr local); +}; + +/****************************************************************************** + * WacomDeviceRec + *****************************************************************************/ + +#define DEVICE_ID(flags) ((flags) & 0x0f) +#define STYLUS_DEVICE_ID 0x02 +#define CURSOR_DEVICE_ID 0x06 +#define ERASER_DEVICE_ID 0x0A +#define PAD_DEVICE_ID 0x0F + +#define STYLUS_ID 0x00000001 +#define CURSOR_ID 0x00000002 +#define ERASER_ID 0x00000004 +#define PAD_ID 0x00000008 +#define ABSOLUTE_FLAG 0x00000010 +#define KEEP_SHAPE_FLAG 0x00000020 +#define BAUD_19200_FLAG 0x00000040 +#define BUTTONS_ONLY_FLAG 0x00000080 +#define TPCBUTTONS_FLAG 0x00000100 +#define TPCBUTTONONE_FLAG 0x00000200 +#define COREEVENT_FLAG 0x00000400 + +#define IsCursor(priv) (DEVICE_ID((priv)->flags) == CURSOR_ID) +#define IsStylus(priv) (DEVICE_ID((priv)->flags) == STYLUS_ID) +#define IsEraser(priv) (DEVICE_ID((priv)->flags) == ERASER_ID) +#define IsPad(priv) (DEVICE_ID((priv)->flags) == PAD_ID) + +#define FILTER_PRESSURE_RES 2048 /* maximum points in pressure curve */ +#define MAX_BUTTONS 32 /* maximum number of tablet buttons */ +#define MAX_MOUSE_BUTTONS 16 /* maximum number of buttons-on-pointer + * (which are treated as mouse buttons, + * not as keys like tablet menu buttons). + * For backword compability support, + * tablet buttons besides the strips are + * treated as buttons */ + +struct _WacomDeviceRec +{ + /* configuration fields */ + struct _WacomDeviceRec *next; + LocalDevicePtr local; + int debugLevel; + + unsigned int flags; /* various flags (type, abs, touch...) */ + int topX; /* X top */ + int topY; /* Y top */ + int bottomX; /* X bottom */ + int bottomY; /* Y bottom */ + int sizeX; /* active X size */ + int sizeY; /* active Y size */ + double factorX; /* X factor */ + double factorY; /* Y factor */ + unsigned int serial; /* device serial number */ + int screen_no; /* associated screen */ + int screenTopX[32]; /* left cordinate of the associated screen */ + int screenTopY[32]; /* top cordinate of the associated screen */ + int screenBottomX[32]; /* right cordinate of the associated screen */ + int screenBottomY[32]; /* bottom cordinate of the associated screen */ + int maxWidth; /* max active screen width */ + int maxHeight; /* max active screen height */ + int button[MAX_BUTTONS];/* buttons assignments */ + unsigned keys[MAX_BUTTONS][256]; /* keystrokes assigned to buttons */ + int relup; + unsigned rupk[256]; /* keystrokes assigned to relative wheel up event (default is button 4) */ + int reldn; + unsigned rdnk[256]; /* keystrokes assigned to relative wheel down event (default is button 5) */ + int wheelup; + unsigned wupk[256]; /* keystrokes assigned to absolute wheel or throttle up event (default is button 4) */ + int wheeldn; + unsigned wdnk[256]; /* keystrokes assigned to absolute wheel or throttle down event (default is button 5) */ + int striplup; + unsigned slupk[256]; /* keystrokes assigned to left strip up event (default is button 4) */ + int stripldn; + unsigned sldnk[256]; /* keystrokes assigned to left strip up event (default is button 5) */ + int striprup; + unsigned srupk[256]; /* keystrokes assigned to right strip up event (default is button 4) */ + int striprdn; + unsigned srdnk[256]; /* keystrokes assigned to right strip up event (default is button 4) */ + int nbuttons; /* number of buttons for this subdevice */ + int naxes; /* number of axes */ + + WacomCommonPtr common;/* common info pointer */ + + /* state fields */ + int currentX; /* current X position */ + int currentY; /* current Y position */ + int currentSX; /* current screen X position */ + int currentSY; /* current screen Y position */ + int oldX; /* previous X position */ + int oldY; /* previous Y position */ + int oldZ; /* previous pressure */ + int oldTiltX; /* previous tilt in x direction */ + int oldTiltY; /* previous tilt in y direction */ + int oldWheel; /* previous wheel value */ + int oldRot; /* previous rotation value */ + int oldStripX; /* previous left strip value */ + int oldStripY; /* previous right strip value */ + int oldThrottle; /* previous throttle value */ + int oldButtons; /* previous buttons state */ + int oldProximity; /* previous proximity */ + int hardProx; /* previous hardware proximity */ + int old_device_id; /* last in prox device id */ + int old_serial; /* last in prox tool serial number */ + int devReverseCount; /* Relative ReverseConvert called twice each movement*/ + double speed; /* relative mode speed */ + int accel; /* relative mode acceleration */ + int numScreen; /* number of configured screens */ + int currentScreen; /* current screen in display */ + int twinview; /* using twinview mode of gfx card */ + int tvoffsetX; /* X edge offset for TwinView setup */ + int tvoffsetY; /* Y edge offset for TwinView setup */ + int tvResolution[4]; /* twinview screens' resultion */ + int wcmMMonitor; /* disable/enable moving across screens in multi-monitor desktop */ + int wcmDevOpenCount; /* Device open count */ + int wcmInitKeyClassCount; /* Device InitKeyClassDeviceStruct count */ + + /* JEJ - throttle */ + int throttleStart; /* time in ticks for last wheel movement */ + int throttleLimit; /* time in ticks for next wheel movement */ + int throttleValue; /* current throttle value */ + + /* JEJ - filters */ + int* pPressCurve; /* pressure curve */ + int nPressCtrl[4]; /* control points for curve */ + + WacomToolPtr tool; /* The common tool-structure for this device */ + WacomToolAreaPtr toolarea; /* The area defined for this device */ +}; + +/****************************************************************************** + * WacomDeviceState + *****************************************************************************/ + +#define MAX_SAMPLES 20 +#define DEFAULT_SAMPLES 4 + +#define PEN(ds) ((((ds)->device_id) & 0x07ff) == 0x0022 || \ + (((ds)->device_id) & 0x07ff) == 0x0042 || \ + (((ds)->device_id) & 0x07ff) == 0x0052) +#define STROKING_PEN(ds) ((((ds)->device_id) & 0x07ff) == 0x0032) +#define AIRBRUSH(ds) ((((ds)->device_id) & 0x07ff) == 0x0112) +#define MOUSE_4D(ds) ((((ds)->device_id) & 0x07ff) == 0x0094) +#define MOUSE_2D(ds) ((((ds)->device_id) & 0x07ff) == 0x0007) +#define LENS_CURSOR(ds) ((((ds)->device_id) & 0x07ff) == 0x0096) +#define INKING_PEN(ds) ((((ds)->device_id) & 0x07ff) == 0x0012) +#define STYLUS_TOOL(ds) (PEN(ds) || STROKING_PEN(ds) || INKING_PEN(ds) || \ + AIRBRUSH(ds)) +#define CURSOR_TOOL(ds) (MOUSE_4D(ds) || LENS_CURSOR(ds) || MOUSE_2D(ds)) + +struct _WacomDeviceState +{ + LocalDevicePtr local; + int device_id; /* tool id reported from the physical device */ + int device_type; + unsigned int serial_num; + int x; + int y; + int buttons; + int pressure; + int tiltx; + int tilty; + int stripx; + int stripy; + int rotation; + int abswheel; + int relwheel; + int distance; + int throttle; + int discard_first; + int proximity; + int sample; /* wraps every 24 days */ +}; + +struct _WacomFilterState +{ + int npoints; + int x[MAX_SAMPLES]; + int y[MAX_SAMPLES]; + int tiltx[MAX_SAMPLES]; + int tilty[MAX_SAMPLES]; + int statex; + int statey; +}; + +struct _WacomChannel +{ + /* data stored in this structure is raw data from the tablet, prior + * to transformation and user-defined filtering. Suppressed values + * will not be included here, and hardware filtering may occur between + * the work stage and the valid state. */ + + WacomDeviceState work; /* next state */ + + /* the following struct contains the current known state of the + * device channel, as well as the previous MAX_SAMPLES states + * for use in detecting hardware defects, jitter, trends, etc. */ + + /* the following union contains the current known state of the + * device channel, as well as the previous MAX_SAMPLES states + * for use in detecting hardware defects, jitter, trends, etc. */ + union + { + WacomDeviceState state; /* current state */ + WacomDeviceState states[MAX_SAMPLES]; /* states 0..MAX */ + } valid; + + int nSamples; + WacomFilterState rawFilter; +}; + +/****************************************************************************** + * WacomDeviceClass + *****************************************************************************/ + +struct _WacomDeviceClass +{ + Bool (*Detect)(LocalDevicePtr local); /* detect device */ + Bool (*Init)(LocalDevicePtr local, char* id, float *version); /* initialize device */ + void (*Read)(LocalDevicePtr local); /* reads device */ +}; + +#ifdef WCM_ENABLE_LINUXINPUT + extern WacomDeviceClass gWacomUSBDevice; +#endif + + extern WacomDeviceClass gWacomISDV4Device; + extern WacomDeviceClass gWacomSerialDevice; + +/****************************************************************************** + * WacomCommonRec + *****************************************************************************/ + +#define TILT_REQUEST_FLAG 1 +#define TILT_ENABLED_FLAG 2 +#define RAW_FILTERING_FLAG 4 +#ifdef WCM_ENABLE_LINUXINPUT +/* set if the /dev/input driver should wait for SYN_REPORT events as the + end of record indicator */ +#define USE_SYN_REPORTS_FLAG 8 +#endif + +#define DEVICE_ISDV4 0x000C + +#define MAX_CHANNELS 2 + +struct _WacomCommonRec +{ + char* wcmDevice; /* device file name */ + unsigned char wcmFlags; /* various flags (handle tilt) */ + int debugLevel; + int tablet_id; /* USB tablet ID */ + int fd; /* file descriptor to tablet */ + int fd_refs; /* number of references to fd; if =0, fd is invalid */ + + /* These values are in tablet coordinates */ + int wcmMaxX; /* tablet max X value */ + int wcmMaxY; /* tablet max Y value */ + int wcmMaxZ; /* tablet max Z value */ + int wcmMaxDist; /* tablet max distance value */ + int wcmResolX; /* tablet X resolution in points/inch */ + int wcmResolY; /* tablet Y resolution in points/inch */ + /* tablet Z resolution is equivalent + * to wcmMaxZ which is equal to 100% + * pressure */ + + /* These values are in user coordinates */ + int wcmUserResolX; /* user-defined X resolution */ + int wcmUserResolY; /* user-defined Y resolution */ + int wcmUserResolZ; /* user-defined Z resolution, + * value equal to 100% pressure */ + + int wcmMaxStripX; /* Maximum fingerstrip X */ + int wcmMaxStripY; /* Maximum fingerstrip Y */ + + int nbuttons; /* total number of buttons */ + int npadkeys; /* number of pad keys in the above array */ + int padkey_code[MAX_BUTTONS];/* hardware codes for buttons */ + + WacomDevicePtr wcmDevices; /* list of devices sharing same port */ + int wcmPktLength; /* length of a packet */ + int wcmProtocolLevel; /* 4 for Wacom IV, 5 for Wacom V */ + float wcmVersion; /* ROM version */ + int wcmForceDevice; /* force device type (used by ISD V4) */ + int wcmRotate; /* rotate screen (for TabletPC) */ + int wcmThreshold; /* Threshold for button pressure */ + WacomChannel wcmChannel[MAX_CHANNELS]; /* channel device state */ + unsigned int wcmLinkSpeed; /* serial link speed */ + unsigned int wcmISDV4Speed; /* serial ISDV4 link speed */ + + WacomDeviceClassPtr wcmDevCls; /* device class functions */ + WacomModelPtr wcmModel; /* model-specific functions */ + char * wcmEraserID; /* eraser associated with the stylus */ + int wcmTPCButton; /* set Tablet PC button on/off */ + int wcmTPCButtonDefault; /* Tablet PC button default */ + int wcmMaxCursorDist; /* Max mouse distance reported so far */ + int wcmCursorProxoutDist; /* Max mouse distance for proxy-out max/256 units */ + int wcmCursorProxoutDistDefault; /* Default max mouse distance for proxy-out */ + int wcmSuppress; /* transmit position on delta > supress */ + int wcmRawSample; /* Number of raw data used to filter an event */ + + int bufpos; /* position with buffer */ + unsigned char buffer[BUFFER_SIZE]; /* data read from device */ + +#ifdef WCM_ENABLE_LINUXINPUT + int wcmLastToolSerial; + int wcmEventCnt; + struct input_event wcmEvents[MAX_USB_EVENTS]; /* events for current change */ +#endif + + WacomToolPtr wcmTool; /* List of unique tools */ +}; + +#define HANDLE_TILT(comm) ((comm)->wcmFlags & TILT_ENABLED_FLAG) +#define RAW_FILTERING(comm) ((comm)->wcmFlags & RAW_FILTERING_FLAG) +#ifdef WCM_ENABLE_LINUXINPUT +#define USE_SYN_REPORTS(comm) ((comm)->wcmFlags & USE_SYN_REPORTS_FLAG) +#endif + +/****************************************************************************** + * WacomTool + *****************************************************************************/ +struct _WacomTool +{ + WacomToolPtr next; /* Next tool in list */ + + int typeid; /* Tool type */ + int serial; /* Serial id, 0 == no serial id */ + + WacomToolAreaPtr current; /* Current area in-prox */ + WacomToolAreaPtr arealist; /* List of defined areas */ +}; + +/****************************************************************************** + * WacomToolArea + *****************************************************************************/ +struct _WacomToolArea +{ + WacomToolAreaPtr next; + + int topX; /* Top X/Y */ + int topY; + int bottomX; /* Bottom X/Y */ + int bottomY; + + LocalDevicePtr device; /* The InputDevice connected to this area */ +}; + +#endif /*__XF86_XF86WACOMDEFS_H */ diff -Nru /tmp/NVRs7qY4g5/wacom-tools-0.7.9.3/linuxwacom/src/xdrv/xf86Wacom.h /tmp/Hb9DOR5R6D/wacom-tools-0.7.9.8/linuxwacom/src/xdrv/xf86Wacom.h --- wacom-tools-0.7.9.3/linuxwacom/src/xdrv/xf86Wacom.h 2007-12-01 16:47:08.000000000 -0500 +++ wacom-tools-0.7.9.8/linuxwacom/src/xdrv/xf86Wacom.h 2008-02-29 18:58:44.000000000 -0500 @@ -1,6 +1,6 @@ /* * Copyright 1995-2002 by Frederic Lepied, France. - * Copyright 2002-2007 by Ping Cheng, Wacom Technology. + * Copyright 2002-2008 by Ping Cheng, Wacom Technology. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -22,6 +22,7 @@ /****************************************************************************/ +#include "../include/xdrv-config.h" #include #include "../include/Xwacom.h" @@ -29,7 +30,7 @@ * Linux Input Support ****************************************************************************/ -#ifdef LINUX_INPUT +#ifdef WCM_ENABLE_LINUXINPUT #include #include @@ -43,7 +44,7 @@ #define MAX_USB_EVENTS 32 -#endif /* LINUX_INPUT */ +#endif /* WCM_ENABLE_LINUXINPUT */ /* max number of input events to read in one read call */ #define MAX_EVENTS 50 @@ -61,8 +62,14 @@ #include #define NEED_XF86_TYPES #if !defined(DGUX) -#include -#include +# include +/* X.org recently kicked out the libc-wrapper */ +# ifdef WCM_NO_LIBCWRAPPER +# include +# include +# else +# include +# endif #endif #include #include @@ -105,64 +112,20 @@ ****************************************************************************/ #define ABS(x) ((x) > 0 ? (x) : -(x)) -#define mils(res) (res * 100 / 2.54) /* resolution */ /***************************************************************************** * General Defines ****************************************************************************/ -#define DEFAULT_SPEED 1.0 /* default relative cursor speed */ -#define MAX_ACCEL 7 /* number of acceleration levels */ -#define DEFAULT_SUPPRESS 2 /* default suppress */ -#define MAX_SUPPRESS 100 /* max value of suppress */ -#define BUFFER_SIZE 256 /* size of reception buffer */ #define XI_STYLUS "STYLUS" /* X device name for the stylus */ #define XI_CURSOR "CURSOR" /* X device name for the cursor */ #define XI_ERASER "ERASER" /* X device name for the eraser */ #define XI_PAD "PAD" /* X device name for the I3 Pad */ -#define MAX_VALUE 100 /* number of positions */ -#define MAXTRY 3 /* max number of try to receive magic number */ -#define MAX_COORD_RES 1270.0 /* Resolution of the returned MaxX and MaxY */ - -/* Default max distance to the tablet at which a proximity-out event is generated for - * cursor device (e.g. mouse). - */ -#define PROXOUT_INTUOS_DISTANCE 10 -#define PROXOUT_GRAPHIRE_DISTANCE 42 - -#define HEADER_BIT 0x80 -#define ZAXIS_SIGN_BIT 0x40 -#define ZAXIS_BIT 0x04 -#define ZAXIS_BITS 0x3F -#define POINTER_BIT 0x20 -#define PROXIMITY_BIT 0x40 -#define BUTTON_FLAG 0x08 -#define BUTTONS_BITS 0x78 -#define TILT_SIGN_BIT 0x40 -#define TILT_BITS 0x3F - -/* defines to discriminate second side button and the eraser */ -#define ERASER_PROX 4 -#define OTHER_PROX 1 - -/****************************************************************************** - * Forward Declarations - *****************************************************************************/ - -typedef struct _WacomModule WacomModule; -typedef struct _WacomModel WacomModel, *WacomModelPtr; -typedef struct _WacomDeviceRec WacomDeviceRec, *WacomDevicePtr; -typedef struct _WacomDeviceState WacomDeviceState, *WacomDeviceStatePtr; -typedef struct _WacomChannel WacomChannel, *WacomChannelPtr; -typedef struct _WacomCommonRec WacomCommonRec, *WacomCommonPtr; -typedef struct _WacomFilterState WacomFilterState, *WacomFilterStatePtr; -typedef struct _WacomDeviceClass WacomDeviceClass, *WacomDeviceClassPtr; -typedef struct _WacomTool WacomTool, *WacomToolPtr; -typedef struct _WacomToolArea WacomToolArea, *WacomToolAreaPtr; /****************************************************************************** * WacomModule - all globals are packed in a single structure to keep the * global namespaces as clean as possible. *****************************************************************************/ +typedef struct _WacomModule WacomModule; struct _WacomModule { @@ -185,375 +148,8 @@ extern WacomModule gWacomModule; -/****************************************************************************** - * WacomModel - model-specific device capabilities - *****************************************************************************/ - -struct _WacomModel -{ - const char* name; - - void (*Initialize)(WacomCommonPtr common, const char* id, float version); - void (*GetResolution)(LocalDevicePtr local); - int (*GetRanges)(LocalDevicePtr local); - int (*Reset)(LocalDevicePtr local); - int (*EnableTilt)(LocalDevicePtr local); - int (*EnableSuppress)(LocalDevicePtr local); - int (*SetLinkSpeed)(LocalDevicePtr local); - int (*Start)(LocalDevicePtr local); - int (*Parse)(LocalDevicePtr local, const unsigned char* data); - int (*FilterRaw)(WacomCommonPtr common, WacomChannelPtr pChannel, - WacomDeviceStatePtr ds); - int (*DetectConfig)(LocalDevicePtr local); -}; - -/****************************************************************************** - * WacomDeviceRec - *****************************************************************************/ - -#define DEVICE_ID(flags) ((flags) & 0x0f) -#define STYLUS_DEVICE_ID 0x02 -#define CURSOR_DEVICE_ID 0x06 -#define ERASER_DEVICE_ID 0x0A -#define PAD_DEVICE_ID 0x0F - -#define STYLUS_ID 0x00000001 -#define CURSOR_ID 0x00000002 -#define ERASER_ID 0x00000004 -#define PAD_ID 0x00000008 -#define ABSOLUTE_FLAG 0x00000010 -#define KEEP_SHAPE_FLAG 0x00000020 -#define BAUD_19200_FLAG 0x00000040 -#define BUTTONS_ONLY_FLAG 0x00000080 -#define TPCBUTTONS_FLAG 0x00000100 -#define TPCBUTTONONE_FLAG 0x00000200 -#define COREEVENT_FLAG 0x00000400 - -#define IsCursor(priv) (DEVICE_ID((priv)->flags) == CURSOR_ID) -#define IsStylus(priv) (DEVICE_ID((priv)->flags) == STYLUS_ID) -#define IsEraser(priv) (DEVICE_ID((priv)->flags) == ERASER_ID) -#define IsPad(priv) (DEVICE_ID((priv)->flags) == PAD_ID) - -typedef int (*FILTERFUNC)(WacomDevicePtr pDev, WacomDeviceStatePtr pState); - -/* FILTERFUNC return values: - * -1 - data should be discarded - * 0 - data is valid */ - -#define FILTER_PRESSURE_RES 2048 /* maximum points in pressure curve */ -#define MAX_BUTTONS 32 /* maximum number of tablet buttons */ -#define MAX_MOUSE_BUTTONS 16 /* maximum number of buttons-on-pointer - * (which are treated as mouse buttons, - * not as keys like tablet menu buttons). - * For backword compability support, - * tablet buttons besides the strips are - * treated as buttons */ - -struct _WacomDeviceRec -{ - /* configuration fields */ - struct _WacomDeviceRec *next; - LocalDevicePtr local; - int debugLevel; - - unsigned int flags; /* various flags (type, abs, touch...) */ - int topX; /* X top */ - int topY; /* Y top */ - int bottomX; /* X bottom */ - int bottomY; /* Y bottom */ - double factorX; /* X factor */ - double factorY; /* Y factor */ - unsigned int serial; /* device serial number */ - int screen_no; /* associated screen */ - int screenTopX[32]; /* left cordinate of the associated screen */ - int screenTopY[32]; /* top cordinate of the associated screen */ - int screenBottomX[32]; /* right cordinate of the associated screen */ - int screenBottomY[32]; /* bottom cordinate of the associated screen */ - int button[MAX_BUTTONS];/* buttons assignments */ - unsigned keys[MAX_BUTTONS][256]; /* keystrokes assigned to buttons */ - int relup; - unsigned rupk[256]; /* keystrokes assigned to relative wheel up event (default is button 4) */ - int reldn; - unsigned rdnk[256]; /* keystrokes assigned to relative wheel down event (default is button 5) */ - int wheelup; - unsigned wupk[256]; /* keystrokes assigned to absolute wheel or throttle up event (default is button 4) */ - int wheeldn; - unsigned wdnk[256]; /* keystrokes assigned to absolute wheel or throttle down event (default is button 5) */ - int striplup; - unsigned slupk[256]; /* keystrokes assigned to left strip up event (default is button 4) */ - int stripldn; - unsigned sldnk[256]; /* keystrokes assigned to left strip up event (default is button 5) */ - int striprup; - unsigned srupk[256]; /* keystrokes assigned to right strip up event (default is button 4) */ - int striprdn; - unsigned srdnk[256]; /* keystrokes assigned to right strip up event (default is button 4) */ - int nbuttons; /* number of buttons for this subdevice */ - int naxes; /* number of axes */ - - WacomCommonPtr common;/* common info pointer */ - - /* state fields */ - int currentX; /* current X position */ - int currentY; /* current Y position */ - int currentSX; /* current screen X position */ - int currentSY; /* current screen Y position */ - int oldX; /* previous X position */ - int oldY; /* previous Y position */ - int oldZ; /* previous pressure */ - int oldTiltX; /* previous tilt in x direction */ - int oldTiltY; /* previous tilt in y direction */ - int oldWheel; /* previous wheel value */ - int oldRot; /* previous rotation value */ - int oldStripX; /* previous left strip value */ - int oldStripY; /* previous right strip value */ - int oldThrottle; /* previous throttle value */ - int oldButtons; /* previous buttons state */ - int oldProximity; /* previous proximity */ - int hardProx; /* previous hardware proximity */ - int old_device_id; /* last in prox device id */ - int old_serial; /* last in prox tool serial number */ - int devReverseCount; /* Relative ReverseConvert called twice each movement*/ - double speed; /* relative mode speed */ - int accel; /* relative mode acceleration */ - int numScreen; /* number of configured screens */ - int currentScreen; /* current screen in display */ - int twinview; /* using twinview mode of gfx card */ - int tvoffsetX; /* X edge offset for TwinView setup */ - int tvoffsetY; /* Y edge offset for TwinView setup */ - int tvResolution[4]; /* twinview screens' resultion */ - int wcmDevOpenCount; /* Device open count */ - - /* JEJ - throttle */ - int throttleStart; /* time in ticks for last wheel movement */ - int throttleLimit; /* time in ticks for next wheel movement */ - int throttleValue; /* current throttle value */ - - /* JEJ - filters */ - int* pPressCurve; /* pressure curve */ - int nPressCtrl[4]; /* control points for curve */ - - WacomToolPtr tool; /* The common tool-structure for this device */ - WacomToolAreaPtr toolarea; /* The area defined for this device */ -}; - -/****************************************************************************** - * WacomDeviceState - *****************************************************************************/ - -#define MAX_SAMPLES 20 -#define DEFAULT_SAMPLES 4 - -#define PEN(ds) ((((ds)->device_id) & 0x07ff) == 0x0022 || \ - (((ds)->device_id) & 0x07ff) == 0x0042 || \ - (((ds)->device_id) & 0x07ff) == 0x0052) -#define STROKING_PEN(ds) ((((ds)->device_id) & 0x07ff) == 0x0032) -#define AIRBRUSH(ds) ((((ds)->device_id) & 0x07ff) == 0x0112) -#define MOUSE_4D(ds) ((((ds)->device_id) & 0x07ff) == 0x0094) -#define MOUSE_2D(ds) ((((ds)->device_id) & 0x07ff) == 0x0007) -#define LENS_CURSOR(ds) ((((ds)->device_id) & 0x07ff) == 0x0096) -#define INKING_PEN(ds) ((((ds)->device_id) & 0x07ff) == 0x0012) -#define STYLUS_TOOL(ds) (PEN(ds) || STROKING_PEN(ds) || INKING_PEN(ds) || \ - AIRBRUSH(ds)) -#define CURSOR_TOOL(ds) (MOUSE_4D(ds) || LENS_CURSOR(ds) || MOUSE_2D(ds)) - -struct _WacomDeviceState -{ - LocalDevicePtr local; - int device_id; /* tool id reported from the physical device */ - int device_type; - unsigned int serial_num; - int x; - int y; - int buttons; - int pressure; - int tiltx; - int tilty; - int stripx; - int stripy; - int rotation; - int abswheel; - int relwheel; - int distance; - int throttle; - int discard_first; - int proximity; - int sample; /* wraps every 24 days */ -}; - -struct _WacomFilterState -{ - int npoints; - int x[MAX_SAMPLES]; - int y[MAX_SAMPLES]; - int tiltx[MAX_SAMPLES]; - int tilty[MAX_SAMPLES]; - int statex; - int statey; -}; - -struct _WacomChannel -{ - /* data stored in this structure is raw data from the tablet, prior - * to transformation and user-defined filtering. Suppressed values - * will not be included here, and hardware filtering may occur between - * the work stage and the valid state. */ - - WacomDeviceState work; /* next state */ - - /* the following struct contains the current known state of the - * device channel, as well as the previous MAX_SAMPLES states - * for use in detecting hardware defects, jitter, trends, etc. */ - - /* the following union contains the current known state of the - * device channel, as well as the previous MAX_SAMPLES states - * for use in detecting hardware defects, jitter, trends, etc. */ - union - { - WacomDeviceState state; /* current state */ - WacomDeviceState states[MAX_SAMPLES]; /* states 0..MAX */ - } valid; - - int nSamples; - WacomFilterState rawFilter; -}; - -/****************************************************************************** - * WacomDeviceClass - *****************************************************************************/ - -struct _WacomDeviceClass -{ - Bool (*Detect)(LocalDevicePtr local); /* detect device */ - Bool (*Init)(LocalDevicePtr local); /* initialize device */ - void (*Read)(LocalDevicePtr local); /* reads device */ -}; - -#ifdef LINUX_INPUT - extern WacomDeviceClass gWacomUSBDevice; -#endif - - extern WacomDeviceClass gWacomISDV4Device; - extern WacomDeviceClass gWacomSerialDevice; - -/****************************************************************************** - * WacomCommonRec - *****************************************************************************/ - -#define TILT_REQUEST_FLAG 1 -#define TILT_ENABLED_FLAG 2 -#define RAW_FILTERING_FLAG 4 -#ifdef LINUX_INPUT -/* set if the /dev/input driver should wait for SYN_REPORT events as the - end of record indicator */ -#define USE_SYN_REPORTS_FLAG 8 -#endif - -#define DEVICE_ISDV4 0x000C - -#define MAX_CHANNELS 2 - -struct _WacomCommonRec -{ - char* wcmDevice; /* device file name */ - unsigned char wcmFlags; /* various flags (handle tilt) */ - int debugLevel; - int tablet_id; /* USB tablet ID */ - int fd; /* file descriptor to tablet */ - int fd_refs; /* number of references to fd; if =0, fd is invalid */ - - /* These values are in tablet coordinates */ - int wcmMaxX; /* tablet max X value */ - int wcmMaxY; /* tablet max Y value */ - int wcmMaxZ; /* tablet max Z value */ - int wcmMaxDist; /* tablet max distance value */ - int wcmResolX; /* tablet X resolution in points/inch */ - int wcmResolY; /* tablet Y resolution in points/inch */ - /* tablet Z resolution is equivalent - * to wcmMaxZ which is equal to 100% - * pressure */ - - /* These values are in user coordinates */ - int wcmUserResolX; /* user-defined X resolution */ - int wcmUserResolY; /* user-defined Y resolution */ - int wcmUserResolZ; /* user-defined Z resolution, - * value equal to 100% pressure */ - - int wcmMaxStripX; /* Maximum fingerstrip X */ - int wcmMaxStripY; /* Maximum fingerstrip Y */ - - int nbuttons; /* total number of buttons */ - int npadkeys; /* number of pad keys in the above array */ - int padkey_code[MAX_BUTTONS];/* hardware codes for buttons */ - - WacomDevicePtr wcmDevices; /* list of devices sharing same port */ - int wcmPktLength; /* length of a packet */ - int wcmProtocolLevel; /* 4 for Wacom IV, 5 for Wacom V */ - float wcmVersion; /* ROM version */ - int wcmForceDevice; /* force device type (used by ISD V4) */ - int wcmRotate; /* rotate screen (for TabletPC) */ - int wcmThreshold; /* Threshold for button pressure */ - WacomChannel wcmChannel[MAX_CHANNELS]; /* channel device state */ - unsigned int wcmLinkSpeed; /* serial link speed */ - unsigned int wcmISDV4Speed; /* serial ISDV4 link speed */ - - WacomDeviceClassPtr wcmDevCls; /* device class functions */ - WacomModelPtr wcmModel; /* model-specific functions */ - char * wcmEraserID; /* eraser associated with the stylus */ - int wcmMMonitor; /* disable/enable moving across screens in multi-monitor desktop */ - int wcmTPCButton; /* set Tablet PC button on/off */ - int wcmTPCButtonDefault; /* Tablet PC button default */ - int wcmMaxCursorDist; /* Max mouse distance reported so far */ - int wcmCursorProxoutDist; /* Max mouse distance for proxy-out max/256 units */ - int wcmCursorProxoutDistDefault; /* Default max mouse distance for proxy-out */ - int wcmSuppress; /* transmit position on delta > supress */ - int wcmRawSample; /* Number of raw data used to filter an event */ - - int bufpos; /* position with buffer */ - unsigned char buffer[BUFFER_SIZE]; /* data read from device */ - -#ifdef LINUX_INPUT - int wcmLastToolSerial; - int wcmEventCnt; - struct input_event wcmEvents[MAX_USB_EVENTS]; /* events for current change */ -#endif - - WacomToolPtr wcmTool; /* List of unique tools */ -}; - -#define HANDLE_TILT(comm) ((comm)->wcmFlags & TILT_ENABLED_FLAG) -#define RAW_FILTERING(comm) ((comm)->wcmFlags & RAW_FILTERING_FLAG) -#ifdef LINUX_INPUT -#define USE_SYN_REPORTS(comm) ((comm)->wcmFlags & USE_SYN_REPORTS_FLAG) -#endif - -/****************************************************************************** - * WacomTool - *****************************************************************************/ -struct _WacomTool -{ - WacomToolPtr next; /* Next tool in list */ - - int typeid; /* Tool type */ - int serial; /* Serial id, 0 == no serial id */ - - WacomToolAreaPtr current; /* Current area in-prox */ - WacomToolAreaPtr arealist; /* List of defined areas */ -}; - -/****************************************************************************** - * WacomToolArea - *****************************************************************************/ -struct _WacomToolArea -{ - WacomToolAreaPtr next; - - int topX; /* Top X/Y */ - int topY; - int bottomX; /* Bottom X/Y */ - int bottomY; - - LocalDevicePtr device; /* The InputDevice connected to this area */ -}; +/* The rest are defined in a separate .h-file */ +#include "xf86WacomDefs.h" /***************************************************************************** * XFree86 V4 Inlined Functions and Prototypes @@ -561,7 +157,6 @@ #define xf86WcmFlushTablet(fd) xf86FlushInput(fd) #define xf86WcmWaitForTablet(fd) xf86WaitForInput((fd), 1000000) -#define xf86WcmOpenTablet(local) xf86OpenSerial((local)->options) #define xf86WcmSetSerialSpeed(fd,rate) xf86SetSerialSpeed((fd),(rate)) #define xf86WcmRead(a,b,c) xf86ReadSerial((a),(b),(c)) @@ -602,7 +197,7 @@ Bool xf86WcmOpen(LocalDevicePtr local); /* common tablet initialization regime */ -int xf86WcmInitTablet(LocalDevicePtr local, WacomModelPtr model, const char* id, float version); +int xf86WcmInitTablet(LocalDevicePtr local, const char* id, float version); /* standard packet handler */ void xf86WcmReadPacket(LocalDevicePtr local); @@ -620,5 +215,8 @@ /* Change pad's mode according to it core event status */ int xf86WcmSetPadCoreMode(LocalDevicePtr local); +/* calculate the proper tablet to screen mapping factor */ +void xf86WcmMappingFactor(LocalDevicePtr local); + /****************************************************************************/ #endif /* __XF86WACOM_H */