Re: [Linuxwacom-devel] Re: [Linuxwacom-discuss] Debian xorg7 transition and 0.7.3-1, patches and issues

[Ron <ro...@de...>]

On Mon, Apr 17, 2006 at 01:29:40AM +0930, Ron wrote:
> Looks like its not quite enough to build the xlib dependent apps
> just yet.  I bypassed AC_WCM_CHECK_XLIB to get wacom_drv to build,
> but since I added nothing to actually stop it from failing, it disables
> the building of xsetwacom, xidump, et al.

Ok.  It looks like there are a couple of things conspiring against us
there, the first is that the "pure64" Debian amd64 port does not use
/usr/X11R6/lib64, or even provide a symlink to /usr/X11R6/lib (like
it does for /usr/lib) -- and even if it did, xorg7 is going to move
all that to /usr/lib/xorg from what I can gather...

So it's probably best if I leave that mostly alone for the present,
while everyone figures out just where to put their 64bit libs and
the xorg files  :(  Explicitly specifying --with-xlib to the correct
location, along with the patches previously posted, will get us by
in the meantime.

That said, I do have two more patches still ;-)  The first just
fixes some quoting in acinclude.m4, without it everything after
the comma is a separate argument and not output with the result.

The second, explicitly supplies the full path to the source files
when building wacom_drv, since use of the VPATH is suppressed there
(I presume due to the substitution of the prerequisite), and it is
otherwise impossible to build it outside of the source dir.  With
this, it builds ok in a subdir too, like the other targets do.

best,
Ron


Index: linuxwacom/acinclude.m4
===================================================================
RCS file: /home/debcvs/wacom-tools/linuxwacom/acinclude.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linuxwacom/acinclude.m4	16 Apr 2006 15:32:50 -0000	1.7
+++ linuxwacom/acinclude.m4	16 Apr 2006 17:44:56 -0000	1.8
@@ -310,14 +310,14 @@
 		WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT
 		AC_MSG_RESULT(found)
 	else
-		AC_MSG_RESULT(not found, tried $WCM_XLIBDIR_DEFAULT/X11)
+		AC_MSG_RESULT([not found, tried $WCM_XLIBDIR_DEFAULT/X11])
 		WCM_ENV_XLIB=no
 	fi
 elif test -d $WCM_XLIBDIR; then
 	WCM_ENV_XLIB=yes
 	AC_MSG_RESULT(found)
 else
-	AC_MSG_RESULT(not found, tried $WCM_XLIBDIR)
+	AC_MSG_RESULT([not found, tried $WCM_XLIBDIR])
 	WCM_ENV_XLIB=no
 fi
 ])

Index: linuxwacom/src/Makefile.am
===================================================================
RCS file: /home/debcvs/wacom-tools/linuxwacom/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linuxwacom/src/Makefile.am	16 Apr 2006 15:32:50 -0000	1.2
+++ linuxwacom/src/Makefile.am	16 Apr 2006 17:59:16 -0000	1.3
@@ -91,7 +91,7 @@
 $(XF86OBJS): xf86Wacom.c Makefile
 	$(CC) $(CFLAGS) $(DEPFLAGS) $(DLLOADER) -pipe -ansi \
 		-pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \
-		-I.  $(DRIVER_INCLUDES) -Dlinux \
+		-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 \
@@ -103,7 +103,7 @@
 		-DX_BYTE_ORDER=X_LITTLE_ENDIAN $(XSERVER64) \
 		-DNDEBUG -DFUNCPROTO=15 \
 		-DNARROWPROTO -DIN_MODULE -DXFree86Module $(LINUX_INPUT) \
-		-o $@ -c $(subst .o,.c,$@)
+		-o $@ -c $(srcdir)/$(subst .o,.c,$@)
 
 if WCM_DLLOADER
 wacom_drv.so: $(XF86OBJS)