On Tue, Jun 05, 2007 at 02:01:37PM -0700, [EMAIL PROTECTED] wrote:
> I posted a new beta, 0.7.7-11, which merged all three patches from Ron
> and fixed a few minor bugs. Please test it and let me know if you see
> any issues.
Thanks, that's uploaded to incoming now with two small but necessary
changes:
We need the initial `echo` since WCM_ARCH isn't an executable command itself:
--- wacom-tools-0.7.7.11.orig/linuxwacom/acinclude.m4
+++ wacom-tools-0.7.7.11/linuxwacom/acinclude.m4
@@ -58,7 +59,7 @@
if test "$WCM_OPTION_XSERVER64" = "yes"; then
CFLAGS="$CFLAGS -D__amd64__"
WCM_XSERVER64="-D_XSERVER64"
- test `$WCM_ARCH | grep -c "x86_64"` == 0 ||
WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel"
+ 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
The important part of this one is that we need the double quotes around
WCM_MODDIR in the first test, without them it has a different meaning
(and wrong result) if WCM_MODDIR is empty. The rest just collapses the
else clause into a 'switch' of elif's which saves two lines of code, but
more usefully, it hopefully makes the expected behaviour a bit more
readable at first glance too.
If we want to be really paranoid, we could probably add another test
after that block to ensure that WCM_MODDIR really does have a value.
If its still empty after this, that means nothing was specified for it
explicitly, AND the autodetection mechanism has failed.
That probably should be an error unless the xorg module is not actually
being built.
--- wacom-tools-0.7.7.11.orig/linuxwacom/configure.in
+++ wacom-tools-0.7.7.11/linuxwacom/configure.in
@@ -336,14 +336,12 @@
[
WCM_MODDIR="$withval"
])
-if test -n $WCM_MODDIR; then
+if test -n "$WCM_MODDIR"; then
WCM_OPTION_DLLOADER=yes
-else
- 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
+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
dnl Check for dlloader
Cheers,
Ron
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Linuxwacom-discuss mailing list
Linuxwacom-discuss@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-discuss
