--- linuxwacom-0.7.6-4/configure.in.xorg73	2006-12-02 02:07:09 +0300
+++ linuxwacom-0.7.6-4/configure.in	2007-09-14 12:17:14 +0400
@@ -371,6 +371,10 @@ if test "$enable_wacomdrv" != "no"; then
 		echo "***"
 	else
 		WCM_OPTION_WACOMDRV=yes
+		if test "x$WCM_ENV_XORGSDK" == "xyes"; then
+			PKG_CHECK_MODULES(XORGSDK, xorg-server)
+			WCM_XORGSDK="$XORGSDK_CFLAGS"
+		fi
 		if test "$WCM_OPTION_DLLOADER" == "yes" ; then
 			WCM_XF86MODULES="$WCM_XF86MODULES wacom_drv.so"
 			WCM_EXPMODULES="$WCM_EXPMODULES wacom_drv.so"
--- linuxwacom-0.7.6-4/src/xdrv/Makefile.am.xorg73	2006-12-02 02:07:09 +0300
+++ linuxwacom-0.7.6-4/src/xdrv/Makefile.am	2007-09-14 12:08:27 +0400
@@ -25,7 +25,7 @@ ARCHITECTURE	=@WCM_ARCH@
 XSERVER64	=@WCM_XSERVER64@
 
 if WCM_ENV_XORGSDK
-DRIVER_INCLUDES = -I$(XORGSDK_DIR) $(X_CFLAGS)
+DRIVER_INCLUDES = $(XORGSDK_DIR) $(X_CFLAGS)
 endif
 
 if WCM_ENV_XF86