Hello community, here is the log from the commit of package x11-input-wacom checked in at Mon May 29 01:22:34 CEST 2006. -------- --- x11-input-wacom/x11-input-wacom.changes 2006-05-15 19:01:58.000000000 +0200 +++ x11-input-wacom/x11-input-wacom.changes 2006-05-26 14:59:32.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 26 14:59:14 CEST 2006 - sndirsch@suse.de + +- updated to release 0.7.4-2 + * fixes a typo in some wacom.c files + +------------------------------------------------------------------- Old: ---- linuxwacom-0.7.4-1.tar.bz2 New: ---- linuxwacom-0.7.4-2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.iU5sY1/_old 2006-05-29 01:22:11.000000000 +0200 +++ /var/tmp/diff_new_pack.iU5sY1/_new 2006-05-29 01:22:11.000000000 +0200 @@ -19,10 +19,10 @@ URL: http://linuxwacom.sourceforge.net/ Group: System/X11/Utilities Version: 0.7.4 -Release: 1 +Release: 2 Summary: X11 input module for wacom tablet Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o -Source: linuxwacom-%{version}-1.tar.bz2 +Source: linuxwacom-%{version}-2.tar.bz2 Patch: fix-linuxwacom-Makefile-64bitArch.diff Patch1: xsetwacom.diff Patch2: linuxwacom-0.7.0-rotate-patch @@ -74,7 +74,7 @@ Ping Cheng <pingc@wacom.com> %prep -%setup -n linuxwacom-%{version}-1 +%setup -n linuxwacom-%{version}-2 %patch %ifnarch s390 s390x %patch1 @@ -93,6 +93,8 @@ %ifarch x86_64 --enable-xserver64 \ %endif + --enable-dlloader \ + --with-xmoduledir=/usr/X11R6/%{_lib}/modules/input \ --with-xlib=/usr/X11R6/%{_lib} \ --with-xorg-sdk=/usr/X11R6/%{_lib}/Server %endif @@ -125,7 +127,7 @@ %dir /usr/X11R6/%_lib/modules/ %dir /usr/X11R6/%_lib/modules/input #### DO NOT STRIP ".o" modules ! ### -%attr (644,root,root) /usr/X11R6/%_lib/modules/input/wacom_drv.o +%attr (644,root,root) /usr/X11R6/%_lib/modules/input/wacom_drv.so %endif %files tools @@ -153,6 +155,9 @@ /usr/%_lib/libwacomcfg.so %changelog -n x11-input-wacom +* Fri May 26 2006 - sndirsch@suse.de +- updated to release 0.7.4-2 + * fixes a typo in some wacom.c files * Sat May 06 2006 - sndirsch@suse.de - updated to release 0.7.4-1 * added support for DTF 521, I3 12x12, and I3 12x19 ++++++ linuxwacom-0.7.4-1.tar.bz2 -> linuxwacom-0.7.4-2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/ChangeLog new/linuxwacom-0.7.4-2/ChangeLog --- old/linuxwacom-0.7.4-1/ChangeLog 2006-05-05 19:25:01.000000000 +0200 +++ new/linuxwacom-0.7.4-2/ChangeLog 2006-05-26 00:41:58.000000000 +0200 @@ -1,3 +1,11 @@ +2006-05-25 Ping Cheng <pingc@wacom.com> + * Fixed a typo in some wacom.c files + * Update configure.in and acinclude.m4 (Ron at Debian) for + xorg 7 installation path + detecting target arch + configure xlib path + * Release as 0.7.4-2 + 2006-05-05 Ping Cheng <pingc@wacom.com> * Updated website * Ready to release 0.7.4 @@ -12,7 +20,7 @@ * Removed SYSCALL for unnecessary statements (Andrew Zabolotny) 2006-04-06 Ping Cheng <pingc@wacom.com> - * Reday to release 0.7.3-1 + * Ready to release 0.7.3-1 2006-03-31 Ping Cheng <pingc@wacom.com> * Support 2.6.16 @@ -24,7 +32,7 @@ 2006-03-14 Ping Cheng <pingc@wacom.com> * Fixed a relative distance bug in wcmCommon.c - * Reday to release 0.7.3 as beta + * Ready to release 0.7.3 as beta 2006-03-06 Ping Cheng <pingc@wacom.com> * Fixed a Volito bug (Kirill Frolov) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/acinclude.m4 new/linuxwacom-0.7.4-2/acinclude.m4 --- old/linuxwacom-0.7.4-1/acinclude.m4 2006-05-05 19:25:01.000000000 +0200 +++ new/linuxwacom-0.7.4-2/acinclude.m4 2006-05-26 00:41:58.000000000 +0200 @@ -29,18 +29,39 @@ WCM_XIDUMP_DEFAULT=yes WCM_ENV_XLIB=no dnl Check architecture -AC_MSG_CHECKING(for processor type) -WCM_ARCH=`uname -m` +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 + +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 -WCM_OPTION_XSERVER64=no -IS64=`echo $WCM_ARCH | grep -c "64"` -if test $IS64 != 0; then +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 - WCM_XLIBDIR_DEFAULT2=/usr/lib64 - WCM_OPTION_XSERVER64=yes + test -L /usr/lib64 || WCM_XLIBDIR_DEFAULT2=/usr/lib64 fi if test -f "$WCM_XLIBDIR_DEFAULT/Server/xf86Version.h"; then WCM_XORGSDK_DEFAULT=$WCM_XLIBDIR_DEFAULT/Server @@ -275,14 +296,14 @@ dnl handle default case AC_MSG_CHECKING(for X lib directory) if test "$WCM_XLIBDIR" == "" || test "$WCM_XLIBDIR" == "yes"; then - if test -d $WCM_XLIBDIR_DEFAULT/X11 || - test -d $WCM_XLIBDIR_DEFAULT; then + if test -f $WCM_XLIBDIR_DEFAULT2/libX11.so; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 AC_MSG_RESULT(found) - elif test -a $WCM_XLIBDIR_DEFAULT2/libX11.so; then + elif test -d $WCM_XLIBDIR_DEFAULT/X11 || + test -d $WCM_XLIBDIR_DEFAULT; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT AC_MSG_RESULT(found) else AC_MSG_RESULT([not found, tried $WCM_XLIBDIR_DEFAULT/X11 and $WCM_XLIBDIR_DEFAULT2]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/aclocal.m4 new/linuxwacom-0.7.4-2/aclocal.m4 --- old/linuxwacom-0.7.4-1/aclocal.m4 2006-05-08 18:32:55.000000000 +0200 +++ new/linuxwacom-0.7.4-2/aclocal.m4 2006-05-26 01:00:50.000000000 +0200 @@ -42,18 +42,39 @@ WCM_XIDUMP_DEFAULT=yes WCM_ENV_XLIB=no dnl Check architecture -AC_MSG_CHECKING(for processor type) -WCM_ARCH=`uname -m` +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 + +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 -WCM_OPTION_XSERVER64=no -IS64=`echo $WCM_ARCH | grep -c "64"` -if test $IS64 != 0; then +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 - WCM_XLIBDIR_DEFAULT2=/usr/lib64 - WCM_OPTION_XSERVER64=yes + test -L /usr/lib64 || WCM_XLIBDIR_DEFAULT2=/usr/lib64 fi if test -f "$WCM_XLIBDIR_DEFAULT/Server/xf86Version.h"; then WCM_XORGSDK_DEFAULT=$WCM_XLIBDIR_DEFAULT/Server @@ -288,14 +309,14 @@ dnl handle default case AC_MSG_CHECKING(for X lib directory) if test "$WCM_XLIBDIR" == "" || test "$WCM_XLIBDIR" == "yes"; then - if test -d $WCM_XLIBDIR_DEFAULT/X11 || - test -d $WCM_XLIBDIR_DEFAULT; then + if test -f $WCM_XLIBDIR_DEFAULT2/libX11.so; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 AC_MSG_RESULT(found) - elif test -a $WCM_XLIBDIR_DEFAULT2/libX11.so; then + elif test -d $WCM_XLIBDIR_DEFAULT/X11 || + test -d $WCM_XLIBDIR_DEFAULT; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT AC_MSG_RESULT(found) else AC_MSG_RESULT([not found, tried $WCM_XLIBDIR_DEFAULT/X11 and $WCM_XLIBDIR_DEFAULT2]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/autom4te.cache/output.0 new/linuxwacom-0.7.4-2/autom4te.cache/output.0 --- old/linuxwacom-0.7.4-1/autom4te.cache/output.0 2006-05-08 18:32:58.000000000 +0200 +++ new/linuxwacom-0.7.4-2/autom4te.cache/output.0 2006-05-26 01:00:53.000000000 +0200 @@ -1020,6 +1020,7 @@ --enable-static=PKGS build static libraries default=yes --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-wacom Enable building wacom.o [default=no] --enable-wacdump Enable building wacdump [default=yes] --enable-xidump Enable building xidump [default=yes] @@ -1034,7 +1035,6 @@ --enable-tabletdev Enable building tabletdev.o [default=no] --enable-dlloader Use dlloader [default=usually] --enable-wacomdrv Enable building wacom_drv.{o,so} [default=yes] - --enable-xserver64 Use specified X server bit [default=usually] --enable-modver Enable kernel module versioning [default=usually] --enable-mkxincludes Enable mkxincludes, XF86 dependency builder [default=no] @@ -1044,6 +1044,7 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-gnu-ld assume the C compiler uses GNU ld default=no --with-pic try to use only PIC/non-PIC objects default=use both + --with-arch Use specified architecture --with-linux Override linux kernel check --with-kernel=dir Specify kernel source directory --with-x-src=dir Specify X driver build directory @@ -1052,7 +1053,8 @@ --with-xlib=dir uses a specified X11R6 directory --with-tcl=dir uses a specified tcl directory --with-tk=dir uses a specified tk directory - --with-arch Use specified architecture + --with-xmoduledir Specify wacom_drv path explicitly. Implies + --enable-dlloader Some influential environment variables: CC C compiler command @@ -7985,19 +7987,44 @@ WCM_ENV_TK=no WCM_XIDUMP_DEFAULT=yes WCM_ENV_XLIB=no -echo "$as_me:$LINENO: checking for processor type" >&5 -echo $ECHO_N "checking for processor type... $ECHO_C" >&6 -WCM_ARCH=`uname -m` +echo "$as_me:$LINENO: checking for arch type" >&5 +echo $ECHO_N "checking for arch type... $ECHO_C" >&6 + +# Check whether --with-arch or --without-arch was given. +if test "${with_arch+set}" = set; then + withval="$with_arch" + WCM_ARCH=$withval + +else + + WCM_ARCH=`$CC -dumpmachine 2> /dev/null` + test $? = 0 || WCM_ARCH=`uname -m` + +fi; echo "$as_me:$LINENO: result: $WCM_ARCH" >&5 echo "${ECHO_T}$WCM_ARCH" >&6 + +# Check whether --enable-xserver64 or --disable-xserver64 was given. +if test "${enable_xserver64+set}" = set; then + enableval="$enable_xserver64" + WCM_OPTION_XSERVER64=$enableval + +else + + WCM_OPTION_XSERVER64=no + test `echo $WCM_ARCH | grep -c "64"` == 0 || WCM_OPTION_XSERVER64=yes + +fi; + WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib WCM_XLIBDIR_DEFAULT2=/usr/lib -WCM_OPTION_XSERVER64=no -IS64=`echo $WCM_ARCH | grep -c "64"` -if test $IS64 != 0; then +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 - WCM_XLIBDIR_DEFAULT2=/usr/lib64 - WCM_OPTION_XSERVER64=yes + test -L /usr/lib64 || WCM_XLIBDIR_DEFAULT2=/usr/lib64 fi if test -f "$WCM_XLIBDIR_DEFAULT/Server/xf86Version.h"; then WCM_XORGSDK_DEFAULT=$WCM_XLIBDIR_DEFAULT/Server @@ -9672,15 +9699,15 @@ echo "$as_me:$LINENO: checking for X lib directory" >&5 echo $ECHO_N "checking for X lib directory... $ECHO_C" >&6 if test "$WCM_XLIBDIR" == "" || test "$WCM_XLIBDIR" == "yes"; then - if test -d $WCM_XLIBDIR_DEFAULT/X11 || - test -d $WCM_XLIBDIR_DEFAULT; then + if test -f $WCM_XLIBDIR_DEFAULT2/libX11.so; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 - elif test -a $WCM_XLIBDIR_DEFAULT2/libX11.so; then + elif test -d $WCM_XLIBDIR_DEFAULT/X11 || + test -d $WCM_XLIBDIR_DEFAULT; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 else @@ -10494,26 +10521,33 @@ fi fi -WCM_MODDIR=$WCM_XLIBDIR/modules/input + +# Check whether --with-xmoduledir or --without-xmoduledir was given. +if test "${with_xmoduledir+set}" = set; then + withval="$with_xmoduledir" + WCM_MODDIR=$withval + +else + + WCM_MODDIR= + if 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 + +fi; + WCM_OPTION_DLLOADER=no -if test -f $WCM_XLIBDIR/modules/input/wacom_drv.so; then - WCM_OPTION_DLLOADER=yes -elif test -f $WCM_XLIBDIR/xorg/modules/input/mouse_drv.so; then - WCM_OPTION_DLLOADER=yes - WCM_MODDIR=$WCM_XLIBDIR/xorg/modules/input -fi # Check whether --enable-dlloader or --disable-dlloader was given. if test "${enable_dlloader+set}" = set; then enableval="$enable_dlloader" - + WCM_OPTION_DLLOADER=$enableval + else - enable_dlloader=$WCM_OPTION_DLLOADER + test -z "$WCM_MODDIR" || WCM_OPTION_DLLOADER=yes + fi; -if test "$enable_dlloader" = "yes"; then - WCM_OPTION_DLLOADER=yes -elif test "$enable_dlloader" = "no"; then - WCM_OPTION_DLLOADER=no -fi @@ -10553,41 +10587,6 @@ fi fi - -# Check whether --with-arch or --without-arch was given. -if test "${with_arch+set}" = set; then - withval="$with_arch" - - WCM_ARCH=$withval - -fi; - -# Check whether --enable-xserver64 or --disable-xserver64 was given. -if test "${enable_xserver64+set}" = set; then - enableval="$enable_xserver64" - -else - enable_xserver64=$WCM_OPTION_XSERVER64 -fi; -if test "$enable_xserver64" = "no"; then - WCM_OPTION_XSERVER64=no - elif test "$enable_xserver64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - WCM_OPTION_XSERVER64=yes - if test "$WCM_ARCH" = "x86_64"; then - WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - fi -else - if test "$WCM_OPTION_XSERVER64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - if test "$WCM_ARCH" = "x86_64"; then - WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - fi - fi -fi - # Check whether --enable-modver or --disable-modver was given. if test "${enable_modver+set}" = set; then enableval="$enable_modver" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/autom4te.cache/traces.0 new/linuxwacom-0.7.4-2/autom4te.cache/traces.0 --- old/linuxwacom-0.7.4-1/autom4te.cache/traces.0 2006-05-08 18:32:58.000000000 +0200 +++ new/linuxwacom-0.7.4-2/autom4te.cache/traces.0 2006-05-26 01:00:53.000000000 +0200 @@ -1,4 +1,4 @@ -m4trace:aclocal.m4:610: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) +m4trace:aclocal.m4:631: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) m4trace:configure.in:2: -1- AC_INIT([src/2.4/wacom.c]) m4trace:configure.in:2: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.in:2: -1- m4_pattern_forbid([_AC_]) @@ -128,10 +128,10 @@ m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_CHECK_TOOL_PREFIX' is obsolete. You should run autoupdate.], [autoconf/programs.m4:188: AC_CHECK_TOOL_PREFIX is expanded from... configure.in:8: AC_CHECK_TOOL_PREFIX is required by... -aclocal.m4:4402: AC_PATH_MAGIC is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4423: AC_PATH_MAGIC is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- AC_SUBST([RANLIB]) m4trace:configure.in:8: -1- AC_SUBST([ac_ct_RANLIB]) @@ -141,150 +141,150 @@ You should run autoupdate.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [instead of using `AC_LANG', `AC_LANG_SAVE', and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete. You should run autoupdate.], [autoconf/c.m4:71: AC_LANG_C is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete. You should run autoupdate.], [autoconf/lang.m4:172: AC_LANG_RESTORE is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete. You should run autoupdate.], [autoconf/general.m4:376: AC_FD_CC is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:1649: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... +aclocal.m4:1670: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... configure.in:8: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is required by... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete. You should run autoupdate.], [autoconf/general.m4:376: AC_FD_CC is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:1649: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... +aclocal.m4:1670: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... configure.in:8: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is required by... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete. You should run autoupdate.], [autoconf/general.m4:376: AC_FD_CC is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:1649: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... +aclocal.m4:1670: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... configure.in:8: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is required by... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete. You should run autoupdate.], [autoconf/general.m4:376: AC_FD_CC is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:1649: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... +aclocal.m4:1670: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is expanded from... configure.in:8: AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE is required by... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) -m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries], [aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries], [aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) -m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries], [aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries], [aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) -m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure], [aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure], [aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) -m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure], [aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure], [aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete. You should run autoupdate.], [autoconf/general.m4:376: AC_FD_CC is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) -m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe], [aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe], [aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) -m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe], [aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +m4trace:configure.in:8: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe], [aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from... -aclocal.m4:4209: _LT_AC_LTCONFIG_HACK is expanded from... -aclocal.m4:1439: AC_LIBTOOL_SETUP is expanded from... +aclocal.m4:4230: _LT_AC_LTCONFIG_HACK is expanded from... +aclocal.m4:1460: AC_LIBTOOL_SETUP is expanded from... configure.in:8: AC_LIBTOOL_SETUP is required by... -aclocal.m4:1328: AC_PROG_LIBTOOL is expanded from... +aclocal.m4:1349: AC_PROG_LIBTOOL is expanded from... configure.in:8: the top level]) m4trace:configure.in:8: -1- AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen], [lt_cv_dlopen="dlopen"], @@ -342,6 +342,14 @@ #undef HAVE_UNISTD_H]) m4trace:configure.in:8: -1- AC_SUBST([LIBTOOL]) m4trace:configure.in:12: -1- AC_SUBST([WCM_LIBWACOMCFG_VER]) +m4trace:configure.in:31: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... +aclocal.m4:123: AC_WCM_CHECK_ENVIRON is expanded from... +configure.in:31: the top level]) +m4trace:configure.in:31: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... +aclocal.m4:123: AC_WCM_CHECK_ENVIRON is expanded from... +configure.in:31: the top level]) m4trace:configure.in:31: -1- AC_DEFINE_TRACE_LITERAL([WCM_ENABLE_LINUXINPUT]) m4trace:configure.in:31: -1- AH_OUTPUT([WCM_ENABLE_LINUXINPUT], [/* Enable the Linux Input subsystem */ #undef WCM_ENABLE_LINUXINPUT]) @@ -418,82 +426,79 @@ m4trace:configure.in:298: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... configure.in:298: the top level]) -m4trace:configure.in:322: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +m4trace:configure.in:314: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... +configure.in:314: the top level]) +m4trace:configure.in:328: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... -configure.in:322: the top level]) -m4trace:configure.in:330: -1- AM_CONDITIONAL([WCM_DLLOADER], [test "$WCM_OPTION_DLLOADER" == "yes"]) -m4trace:configure.in:330: -1- AC_SUBST([WCM_DLLOADER_TRUE]) -m4trace:configure.in:330: -1- AC_SUBST([WCM_DLLOADER_FALSE]) -m4trace:configure.in:335: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... -configure.in:335: the top level]) -m4trace:configure.in:358: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... -configure.in:358: the top level]) -m4trace:configure.in:365: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... -configure.in:365: the top level]) -m4trace:configure.in:389: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... -configure.in:389: the top level]) -m4trace:configure.in:414: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_DRVALUE]) -m4trace:configure.in:414: -1- AH_OUTPUT([WCM_PATCH_DRVALUE], [/* Need the dr.wValue patch */ +configure.in:328: the top level]) +m4trace:configure.in:334: -1- AM_CONDITIONAL([WCM_DLLOADER], [test "$WCM_OPTION_DLLOADER" == "yes"]) +m4trace:configure.in:334: -1- AC_SUBST([WCM_DLLOADER_TRUE]) +m4trace:configure.in:334: -1- AC_SUBST([WCM_DLLOADER_FALSE]) +m4trace:configure.in:339: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... +configure.in:339: the top level]) +m4trace:configure.in:362: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... +configure.in:362: the top level]) +m4trace:configure.in:387: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_DRVALUE]) +m4trace:configure.in:387: -1- AH_OUTPUT([WCM_PATCH_DRVALUE], [/* Need the dr.wValue patch */ #undef WCM_PATCH_DRVALUE]) -m4trace:configure.in:418: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_DRVALUE]) -m4trace:configure.in:418: -1- AH_OUTPUT([WCM_PATCH_DRVALUE], [/* Do not need the dr.wValue patch */ +m4trace:configure.in:391: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_DRVALUE]) +m4trace:configure.in:391: -1- AH_OUTPUT([WCM_PATCH_DRVALUE], [/* Do not need the dr.wValue patch */ #undef WCM_PATCH_DRVALUE]) -m4trace:configure.in:433: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_DRVALUE]) -m4trace:configure.in:433: -1- AH_OUTPUT([WCM_PATCH_DRVALUE], [/* Do not need the dr.wValue patch */ +m4trace:configure.in:406: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_DRVALUE]) +m4trace:configure.in:406: -1- AH_OUTPUT([WCM_PATCH_DRVALUE], [/* Do not need the dr.wValue patch */ #undef WCM_PATCH_DRVALUE]) -m4trace:configure.in:442: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_NOQUIRK]) -m4trace:configure.in:442: -1- AH_OUTPUT([WCM_PATCH_NOQUIRK], [/* Missing quirks */ +m4trace:configure.in:415: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_NOQUIRK]) +m4trace:configure.in:415: -1- AH_OUTPUT([WCM_PATCH_NOQUIRK], [/* Missing quirks */ #undef WCM_PATCH_NOQUIRK]) -m4trace:configure.in:445: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_NOQUIRK]) -m4trace:configure.in:445: -1- AH_OUTPUT([WCM_PATCH_NOQUIRK], [/* Missing quirks */ +m4trace:configure.in:418: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_NOQUIRK]) +m4trace:configure.in:418: -1- AH_OUTPUT([WCM_PATCH_NOQUIRK], [/* Missing quirks */ #undef WCM_PATCH_NOQUIRK]) -m4trace:configure.in:460: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_NOQUIRK]) -m4trace:configure.in:460: -1- AH_OUTPUT([WCM_PATCH_NOQUIRK], [/* Missing quirks */ +m4trace:configure.in:433: -1- AC_DEFINE_TRACE_LITERAL([WCM_PATCH_NOQUIRK]) +m4trace:configure.in:433: -1- AH_OUTPUT([WCM_PATCH_NOQUIRK], [/* Missing quirks */ #undef WCM_PATCH_NOQUIRK]) -m4trace:configure.in:467: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +m4trace:configure.in:440: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from... -configure.in:467: the top level]) -m4trace:configure.in:480: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. +configure.in:440: the top level]) +m4trace:configure.in:453: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from... -configure.in:480: the top level]) -m4trace:configure.in:507: -1- AC_SUBST([WCM_PROGS]) -m4trace:configure.in:508: -1- AC_SUBST([WCM_LIBS]) -m4trace:configure.in:509: -1- AC_SUBST([WCM_TCLLIBS]) -m4trace:configure.in:510: -1- AC_SUBST([WCM_TCLPKGS]) -m4trace:configure.in:511: -1- AC_SUBST([WCM_MODULES]) -m4trace:configure.in:512: -1- AC_SUBST([WCM_XF86PROGS]) -m4trace:configure.in:513: -1- AC_SUBST([WCM_XF86MODULES]) -m4trace:configure.in:514: -1- AC_SUBST([WCM_EXPPROGS]) -m4trace:configure.in:515: -1- AC_SUBST([WCM_EXPMODULES]) -m4trace:configure.in:516: -1- AC_SUBST([WCM_ARCH]) -m4trace:configure.in:517: -1- AC_SUBST([WCM_KSTACK]) -m4trace:configure.in:518: -1- AC_SUBST([WCM_MODVER]) -m4trace:configure.in:519: -1- AC_SUBST([WCM_KERNELDIR]) -m4trace:configure.in:520: -1- AC_SUBST([WCM_KERNEL_VER]) -m4trace:configure.in:521: -1- AC_SUBST([WCM_LINUXWACOMDIR]) -m4trace:configure.in:522: -1- AC_SUBST([WCM_XF86DIR]) -m4trace:configure.in:523: -1- AC_SUBST([WCM_XORGSDK]) -m4trace:configure.in:524: -1- AC_SUBST([WCM_XLIBDIR]) -m4trace:configure.in:525: -1- AC_SUBST([WCM_MODDIR]) -m4trace:configure.in:526: -1- AC_SUBST([WCM_XSERVER64]) -m4trace:configure.in:528: -1- AC_SUBST([WCM_NO_MERGE_CONSTANTS]) -m4trace:configure.in:529: -1- AC_SUBST([WCM_LINUX_INPUT]) -m4trace:configure.in:530: -1- AC_SUBST([WCM_XIDUMP_LIBS]) -m4trace:configure.in:531: -1- AC_SUBST([WCM_LIBWACOMCFG_LIBS]) -m4trace:configure.in:532: -1- AC_SUBST([WCM_WACOMXI_LIBS]) -m4trace:configure.in:533: -1- AC_SUBST([WCM_XSETWACOM_LIBS]) -m4trace:configure.in:534: -1- AC_SUBST([WCM_DEPFLAGS]) -m4trace:configure.in:535: -1- AC_SUBST([WCM_OPTION_WACOM]) -m4trace:configure.in:536: -1- AC_SUBST([WCM_OPTION_HID]) -m4trace:configure.in:537: -1- AC_SUBST([WCM_OPTION_EVDEV]) -m4trace:configure.in:538: -1- AC_SUBST([WCM_OPTION_MOUSEDEV]) -m4trace:configure.in:539: -1- AC_SUBST([WCM_OPTION_USBMOUSE]) -m4trace:configure.in:540: -1- AC_SUBST([WCM_OPTION_INPUT]) -m4trace:configure.in:557: -1- AC_CONFIG_FILES([Makefile +configure.in:453: the top level]) +m4trace:configure.in:480: -1- AC_SUBST([WCM_PROGS]) +m4trace:configure.in:481: -1- AC_SUBST([WCM_LIBS]) +m4trace:configure.in:482: -1- AC_SUBST([WCM_TCLLIBS]) +m4trace:configure.in:483: -1- AC_SUBST([WCM_TCLPKGS]) +m4trace:configure.in:484: -1- AC_SUBST([WCM_MODULES]) +m4trace:configure.in:485: -1- AC_SUBST([WCM_XF86PROGS]) +m4trace:configure.in:486: -1- AC_SUBST([WCM_XF86MODULES]) +m4trace:configure.in:487: -1- AC_SUBST([WCM_EXPPROGS]) +m4trace:configure.in:488: -1- AC_SUBST([WCM_EXPMODULES]) +m4trace:configure.in:489: -1- AC_SUBST([WCM_ARCH]) +m4trace:configure.in:490: -1- AC_SUBST([WCM_KSTACK]) +m4trace:configure.in:491: -1- AC_SUBST([WCM_MODVER]) +m4trace:configure.in:492: -1- AC_SUBST([WCM_KERNELDIR]) +m4trace:configure.in:493: -1- AC_SUBST([WCM_KERNEL_VER]) +m4trace:configure.in:494: -1- AC_SUBST([WCM_LINUXWACOMDIR]) +m4trace:configure.in:495: -1- AC_SUBST([WCM_XF86DIR]) +m4trace:configure.in:496: -1- AC_SUBST([WCM_XORGSDK]) +m4trace:configure.in:497: -1- AC_SUBST([WCM_XLIBDIR]) +m4trace:configure.in:498: -1- AC_SUBST([WCM_MODDIR]) +m4trace:configure.in:499: -1- AC_SUBST([WCM_XSERVER64]) +m4trace:configure.in:501: -1- AC_SUBST([WCM_NO_MERGE_CONSTANTS]) +m4trace:configure.in:502: -1- AC_SUBST([WCM_LINUX_INPUT]) +m4trace:configure.in:503: -1- AC_SUBST([WCM_XIDUMP_LIBS]) +m4trace:configure.in:504: -1- AC_SUBST([WCM_LIBWACOMCFG_LIBS]) +m4trace:configure.in:505: -1- AC_SUBST([WCM_WACOMXI_LIBS]) +m4trace:configure.in:506: -1- AC_SUBST([WCM_XSETWACOM_LIBS]) +m4trace:configure.in:507: -1- AC_SUBST([WCM_DEPFLAGS]) +m4trace:configure.in:508: -1- AC_SUBST([WCM_OPTION_WACOM]) +m4trace:configure.in:509: -1- AC_SUBST([WCM_OPTION_HID]) +m4trace:configure.in:510: -1- AC_SUBST([WCM_OPTION_EVDEV]) +m4trace:configure.in:511: -1- AC_SUBST([WCM_OPTION_MOUSEDEV]) +m4trace:configure.in:512: -1- AC_SUBST([WCM_OPTION_USBMOUSE]) +m4trace:configure.in:513: -1- AC_SUBST([WCM_OPTION_INPUT]) +m4trace:configure.in:530: -1- AC_CONFIG_FILES([Makefile mkxincludes src/Makefile src/2.4/Makefile @@ -509,35 +514,35 @@ src/2.6.16/Makefile src/wacomxi/Makefile src/wacomxi/wacomcpl]) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. You should run autoupdate.], []) -m4trace:configure.in:557: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) -m4trace:configure.in:557: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +m4trace:configure.in:530: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) +m4trace:configure.in:530: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"AMDEP\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_ENV_XF86\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_ENV_XF86\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_ENV_XF86\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_ENV_XF86\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_ENV_XORGSDK\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_ENV_XORGSDK\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_ENV_XORGSDK\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_ENV_XORGSDK\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_ENV_NCURSES\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_ENV_NCURSES\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_ENV_NCURSES\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_ENV_NCURSES\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WACOMXI_INSTALL\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WACOMXI_INSTALL\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WACOMXI_INSTALL\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WACOMXI_INSTALL\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_DLLOADER\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: conditional \"WCM_DLLOADER\" was never defined. Usually this means the macro was only invoked conditionally.], []) -m4trace:configure.in:557: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_DLLOADER\" was never defined. +m4trace:configure.in:530: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: conditional \"WCM_DLLOADER\" was never defined. Usually this means the macro was only invoked conditionally.], []) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/configure new/linuxwacom-0.7.4-2/configure --- old/linuxwacom-0.7.4-1/configure 2006-05-08 18:33:04.000000000 +0200 +++ new/linuxwacom-0.7.4-2/configure 2006-05-26 01:00:59.000000000 +0200 @@ -1020,6 +1020,7 @@ --enable-static=PKGS build static libraries default=yes --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-wacom Enable building wacom.o [default=no] --enable-wacdump Enable building wacdump [default=yes] --enable-xidump Enable building xidump [default=yes] @@ -1034,7 +1035,6 @@ --enable-tabletdev Enable building tabletdev.o [default=no] --enable-dlloader Use dlloader [default=usually] --enable-wacomdrv Enable building wacom_drv.{o,so} [default=yes] - --enable-xserver64 Use specified X server bit [default=usually] --enable-modver Enable kernel module versioning [default=usually] --enable-mkxincludes Enable mkxincludes, XF86 dependency builder [default=no] @@ -1044,6 +1044,7 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-gnu-ld assume the C compiler uses GNU ld default=no --with-pic try to use only PIC/non-PIC objects default=use both + --with-arch Use specified architecture --with-linux Override linux kernel check --with-kernel=dir Specify kernel source directory --with-x-src=dir Specify X driver build directory @@ -1052,7 +1053,8 @@ --with-xlib=dir uses a specified X11R6 directory --with-tcl=dir uses a specified tcl directory --with-tk=dir uses a specified tk directory - --with-arch Use specified architecture + --with-xmoduledir Specify wacom_drv path explicitly. Implies + --enable-dlloader Some influential environment variables: CC C compiler command @@ -4660,7 +4662,7 @@ case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4663 "configure"' > conftest.$ac_ext + echo '#line 4665 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5222,7 +5224,7 @@ save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -7119,7 +7121,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 7122 "configure" +#line 7124 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -7217,7 +7219,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 7220 "configure" +#line 7222 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -7985,19 +7987,44 @@ WCM_ENV_TK=no WCM_XIDUMP_DEFAULT=yes WCM_ENV_XLIB=no -echo "$as_me:$LINENO: checking for processor type" >&5 -echo $ECHO_N "checking for processor type... $ECHO_C" >&6 -WCM_ARCH=`uname -m` +echo "$as_me:$LINENO: checking for arch type" >&5 +echo $ECHO_N "checking for arch type... $ECHO_C" >&6 + +# Check whether --with-arch or --without-arch was given. +if test "${with_arch+set}" = set; then + withval="$with_arch" + WCM_ARCH=$withval + +else + + WCM_ARCH=`$CC -dumpmachine 2> /dev/null` + test $? = 0 || WCM_ARCH=`uname -m` + +fi; echo "$as_me:$LINENO: result: $WCM_ARCH" >&5 echo "${ECHO_T}$WCM_ARCH" >&6 + +# Check whether --enable-xserver64 or --disable-xserver64 was given. +if test "${enable_xserver64+set}" = set; then + enableval="$enable_xserver64" + WCM_OPTION_XSERVER64=$enableval + +else + + WCM_OPTION_XSERVER64=no + test `echo $WCM_ARCH | grep -c "64"` == 0 || WCM_OPTION_XSERVER64=yes + +fi; + WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib WCM_XLIBDIR_DEFAULT2=/usr/lib -WCM_OPTION_XSERVER64=no -IS64=`echo $WCM_ARCH | grep -c "64"` -if test $IS64 != 0; then +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 - WCM_XLIBDIR_DEFAULT2=/usr/lib64 - WCM_OPTION_XSERVER64=yes + test -L /usr/lib64 || WCM_XLIBDIR_DEFAULT2=/usr/lib64 fi if test -f "$WCM_XLIBDIR_DEFAULT/Server/xf86Version.h"; then WCM_XORGSDK_DEFAULT=$WCM_XLIBDIR_DEFAULT/Server @@ -9672,15 +9699,15 @@ echo "$as_me:$LINENO: checking for X lib directory" >&5 echo $ECHO_N "checking for X lib directory... $ECHO_C" >&6 if test "$WCM_XLIBDIR" == "" || test "$WCM_XLIBDIR" == "yes"; then - if test -d $WCM_XLIBDIR_DEFAULT/X11 || - test -d $WCM_XLIBDIR_DEFAULT; then + if test -f $WCM_XLIBDIR_DEFAULT2/libX11.so; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 - elif test -a $WCM_XLIBDIR_DEFAULT2/libX11.so; then + elif test -d $WCM_XLIBDIR_DEFAULT/X11 || + test -d $WCM_XLIBDIR_DEFAULT; then WCM_ENV_XLIB=yes - WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT2 + WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 else @@ -10494,26 +10521,33 @@ fi fi -WCM_MODDIR=$WCM_XLIBDIR/modules/input + +# Check whether --with-xmoduledir or --without-xmoduledir was given. +if test "${with_xmoduledir+set}" = set; then + withval="$with_xmoduledir" + WCM_MODDIR=$withval + +else + + WCM_MODDIR= + if 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 + +fi; + WCM_OPTION_DLLOADER=no -if test -f $WCM_XLIBDIR/modules/input/wacom_drv.so; then - WCM_OPTION_DLLOADER=yes -elif test -f $WCM_XLIBDIR/xorg/modules/input/mouse_drv.so; then - WCM_OPTION_DLLOADER=yes - WCM_MODDIR=$WCM_XLIBDIR/xorg/modules/input -fi # Check whether --enable-dlloader or --disable-dlloader was given. if test "${enable_dlloader+set}" = set; then enableval="$enable_dlloader" + WCM_OPTION_DLLOADER=$enableval else - enable_dlloader=$WCM_OPTION_DLLOADER + test -z "$WCM_MODDIR" || WCM_OPTION_DLLOADER=yes + fi; -if test "$enable_dlloader" = "yes"; then - WCM_OPTION_DLLOADER=yes -elif test "$enable_dlloader" = "no"; then - WCM_OPTION_DLLOADER=no -fi @@ -10553,41 +10587,6 @@ fi fi - -# Check whether --with-arch or --without-arch was given. -if test "${with_arch+set}" = set; then - withval="$with_arch" - - WCM_ARCH=$withval - -fi; - -# Check whether --enable-xserver64 or --disable-xserver64 was given. -if test "${enable_xserver64+set}" = set; then - enableval="$enable_xserver64" - -else - enable_xserver64=$WCM_OPTION_XSERVER64 -fi; -if test "$enable_xserver64" = "no"; then - WCM_OPTION_XSERVER64=no - elif test "$enable_xserver64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - WCM_OPTION_XSERVER64=yes - if test "$WCM_ARCH" = "x86_64"; then - WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - fi -else - if test "$WCM_OPTION_XSERVER64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - if test "$WCM_ARCH" = "x86_64"; then - WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - fi - fi -fi - # Check whether --enable-modver or --disable-modver was given. if test "${enable_modver+set}" = set; then enableval="$enable_modver" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/configure.in new/linuxwacom-0.7.4-2/configure.in --- old/linuxwacom-0.7.4-1/configure.in 2006-05-05 19:25:01.000000000 +0200 +++ new/linuxwacom-0.7.4-2/configure.in 2006-05-26 00:41:58.000000000 +0200 @@ -310,22 +310,26 @@ fi dnl Check for dlloader -WCM_MODDIR=$WCM_XLIBDIR/modules/input +AC_ARG_WITH(xmoduledir, +AC_HELP_STRING([--with-xmoduledir], [Specify wacom_drv path explicitly. Implies --enable-dlloader]), +[ WCM_MODDIR=$withval +], +[ + WCM_MODDIR= + if 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 +]) + WCM_OPTION_DLLOADER=no -if test -f $WCM_XLIBDIR/modules/input/wacom_drv.so; then - WCM_OPTION_DLLOADER=yes -elif test -f $WCM_XLIBDIR/xorg/modules/input/mouse_drv.so; then - WCM_OPTION_DLLOADER=yes - WCM_MODDIR=$WCM_XLIBDIR/xorg/modules/input -fi AC_ARG_ENABLE(dlloader, AC_HELP_STRING([--enable-dlloader], [Use dlloader [[default=usually]]]), - , enable_dlloader=$WCM_OPTION_DLLOADER) -if test "$enable_dlloader" = "yes"; then - WCM_OPTION_DLLOADER=yes -elif test "$enable_dlloader" = "no"; then - WCM_OPTION_DLLOADER=no -fi +[ WCM_OPTION_DLLOADER=$enableval +], +[ test -z "$WCM_MODDIR" || WCM_OPTION_DLLOADER=yes +]) AM_CONDITIONAL(WCM_DLLOADER, test "$WCM_OPTION_DLLOADER" == "yes") @@ -353,37 +357,6 @@ fi fi -dnl Check for arch -AC_ARG_WITH(arch, -AC_HELP_STRING([--with-arch], [Use specified architecture]), -[ - WCM_ARCH=$withval -]) - -dnl Check for X server bit -AC_ARG_ENABLE(xserver64, -AC_HELP_STRING([--enable-xserver64], [Use specified X server bit [[default=usually]]]), - , enable_xserver64=$WCM_OPTION_XSERVER64) -if test "$enable_xserver64" = "no"; then - WCM_OPTION_XSERVER64=no - elif test "$enable_xserver64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - WCM_OPTION_XSERVER64=yes - if test "$WCM_ARCH" = "x86_64"; then - WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - fi -else - dnl not explicitly set, go with default - if test "$WCM_OPTION_XSERVER64" = "yes"; then - CFLAGS="$CFLAGS -D__amd64__" - WCM_XSERVER64="-D_XSERVER64" - if test "$WCM_ARCH" = "x86_64"; then - WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel" - fi - fi -fi - dnl Check for modver AC_ARG_ENABLE(modver, AC_HELP_STRING([--enable-modver], [Enable kernel module versioning [[default=usually]]]), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6/wacom.c new/linuxwacom-0.7.4-2/src/2.6/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6/wacom.c 2006-05-05 19:25:02.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -968,7 +968,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6.10/wacom.c new/linuxwacom-0.7.4-2/src/2.6.10/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6.10/wacom.c 2006-05-05 19:25:02.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6.10/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -970,7 +970,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6.11/wacom.c new/linuxwacom-0.7.4-2/src/2.6.11/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6.11/wacom.c 2006-05-05 19:25:02.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6.11/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -973,7 +973,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6.13/wacom.c new/linuxwacom-0.7.4-2/src/2.6.13/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6.13/wacom.c 2006-05-05 19:25:02.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6.13/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -946,7 +946,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6.14/wacom.c new/linuxwacom-0.7.4-2/src/2.6.14/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6.14/wacom.c 2006-05-05 19:25:03.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6.14/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -943,7 +943,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6.8/wacom.c new/linuxwacom-0.7.4-2/src/2.6.8/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6.8/wacom.c 2006-05-05 19:25:06.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6.8/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -971,7 +971,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxwacom-0.7.4-1/src/2.6.9/wacom.c new/linuxwacom-0.7.4-2/src/2.6.9/wacom.c --- old/linuxwacom-0.7.4-1/src/2.6.9/wacom.c 2006-05-05 19:25:06.000000000 +0200 +++ new/linuxwacom-0.7.4-2/src/2.6.9/wacom.c 2006-05-26 00:41:58.000000000 +0200 @@ -971,7 +971,7 @@ break; case PENPARTNER: - input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); + wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER); break; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de