diff -u -r linuxwacom-0.6.6.orig/acinclude.m4 linuxwacom-0.6.6/acinclude.m4
--- linuxwacom-0.6.6.orig/acinclude.m4	2004-12-01 22:08:25.000000000 +0100
+++ linuxwacom-0.6.6/acinclude.m4	2005-02-27 21:06:26.630861529 +0100
@@ -326,22 +326,14 @@
 ])
 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
-if test "$WCM_XLIBDIR" == "" || test "$WCM_XLIBDIR" == "yes"; then
-	AC_MSG_CHECKING(for X lib directory)
-	if test -d $WCM_XLIBDIR_DEFAULT/X11; 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)
-		WCM_ENV_XLIB=no
-	fi
+AC_PATH_XTRA
+WCM_XLIBDIR=$X_LIBS
+CFLAGS="$CFLAGS $X_CFLAGS/X11"
+if test "$X_DISPLAY_MISSING" != ""
+then
+	WCM_ENV_XLIB=no
+else
+	WCM_ENV_XLIB=yes
 fi
 ])
 AC_DEFUN([AC_WCM_CHECK_TCL],[
diff -u -r linuxwacom-0.6.6.orig/configure.in linuxwacom-0.6.6/configure.in
--- linuxwacom-0.6.6.orig/configure.in	2004-12-01 22:10:12.000000000 +0100
+++ linuxwacom-0.6.6/configure.in	2004-12-29 00:42:53.000000000 +0100
@@ -22,6 +22,7 @@
 WCM_EXPPROGS=""
 WCM_EXPMODULES=""
 WCM_PATCH_HID=""
+WCM_XSERVER64=""
 
 dnl Setup paths based on configuration parameters
 AC_WCM_SET_PATHS
@@ -45,6 +46,12 @@
 AC_WCM_CHECK_TCL
 AC_WCM_CHECK_TK
 
+dnl Check for 64 bit server
+AC_ARG_VAR(ac_cv_sizeof_char_p, [sizeof(char*)])
+if test x$ac_cv_sizeof_char_p != x4; then
+	WCM_XSERVER64="-D_XSERVER64 -DDDXTIME"
+fi
+
 dnl Check for ncurses
 AC_WCM_CHECK_NCURSES
 
@@ -448,6 +455,7 @@
 AC_SUBST(WCM_XORGSDK)
 AC_SUBST(WCM_XF86DIR)
 AC_SUBST(WCM_XLIBDIR)
+AC_SUBST(WCM_XSERVER64)
 AC_SUBST(WCM_NO_MERGE_CONSTANTS)
 AC_SUBST(WCM_LINUX_INPUT)
 AC_SUBST(WCM_XIDUMP_LIBS)
@@ -455,12 +463,12 @@
 AC_SUBST(WCM_WACOMXI_LIBS)
 AC_SUBST(WCM_XSETWACOM_LIBS)
 AC_SUBST(WCM_DEPFLAGS)
-AC_SUBST(WCM_OPTION_WACOM)
-AC_SUBST(WCM_OPTION_HID)
-AC_SUBST(WCM_OPTION_EVDEV)
-AC_SUBST(WCM_OPTION_MOUSEDEV)
-AC_SUBST(WCM_OPTION_USBMOUSE)
-AC_SUBST(WCM_OPTION_INPUT)
+AC_SUBST(WCM_OPTION_WACOM)
+AC_SUBST(WCM_OPTION_HID)
+AC_SUBST(WCM_OPTION_EVDEV)
+AC_SUBST(WCM_OPTION_MOUSEDEV)
+AC_SUBST(WCM_OPTION_USBMOUSE)
+AC_SUBST(WCM_OPTION_INPUT)
  
 AC_OUTPUT(Makefile
 	mkxincludes
diff -u -r linuxwacom-0.6.6.orig/src/Makefile.am linuxwacom-0.6.6/src/Makefile.am
--- linuxwacom-0.6.6.orig/src/Makefile.am	2004-12-01 22:13:15.000000000 +0100
+++ linuxwacom-0.6.6/src/Makefile.am	2005-02-27 21:06:58.435350539 +0100
@@ -85,7 +85,7 @@
 	gcc $(CFLAGS) $(DEPFLAGS) -pipe -ansi \
 		-pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \
 		-I. $(DRIVER_INCLUDES) \
-		-Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE \
+		-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 -DPANORAMIX \
@@ -94,7 +94,7 @@
 		-DXFree86Server -DXF86VIDMODE -DXvMCExtension \
 		-DSMART_SCHEDULE -DBUILDDEBUG -DXResExtension \
 		-DX_BYTE_ORDER=X_LITTLE_ENDIAN -DNDEBUG -DFUNCPROTO=15 \
-		-DNARROWPROTO -DIN_MODULE -DXFree86Module $(LINUX_INPUT) \
+		-DNARROWPROTO -DIN_MODULE @WCM_XSERVER64@ -DXFree86Module $(LINUX_INPUT) \
 		-o $@ -c $(subst .o,.c,$@)
 
 wacom_drv.o: $(XF86OBJS)