*** oldconfigure.in	2010-01-22 11:21:23.867760957 +0300
--- linuxwacom-0.8.5-9/configure.in	2010-01-22 11:28:37.871669674 +0300
***************
*** 581,587 ****
  fi
  AM_CONDITIONAL(WCM_ENV_XORGSDK, [test "$WCM_ENV_XORGSDK" = yes])
  
! if test "$WCM_XORG_XSERVER_1_6" == yes; then
  	AC_MSG_CHECKING(for lib xf86config)
  	if test -f $WCM_XLIB_DIR/libxf86config.a -o -f $WCM_XLIB_DIR/libxf86config.so; then
  		if test -f $WCM_XFREE86_DIR/$XFREE86SUBDIR/xf86Parser.h; then
--- 581,593 ----
  fi
  AM_CONDITIONAL(WCM_ENV_XORGSDK, [test "$WCM_ENV_XORGSDK" = yes])
  
! WCM_OPTION_XF86CONFIG=no
! AC_ARG_ENABLE(xf86config,
!         AC_HELP_STRING([--enable-xf86config], [Enable libxf86config support if present [[default=yes]]]),
!         [ WCM_OPTION_XF86CONFIG=$enableval ],
!         [ WCM_OPTION_XF86CONFIG=yes ])
! 
! if test "$WCM_XORG_XSERVER_1_6" == yes -a "$WCM_OPTION_XF86CONFIG" == yes; then
  	AC_MSG_CHECKING(for lib xf86config)
  	if test -f $WCM_XLIB_DIR/libxf86config.a -o -f $WCM_XLIB_DIR/libxf86config.so; then
  		if test -f $WCM_XFREE86_DIR/$XFREE86SUBDIR/xf86Parser.h; then