diff --git a/x11-drivers/linuxwacom/files/linuxwacom-0.8.3_p6-xf86config.patch b/x11-drivers/linuxwacom/files/linuxwacom-0.8.3_p6-xf86config.patch deleted file mode 100644 --- a/x11-drivers/linuxwacom/files/linuxwacom-0.8.3_p6-xf86config.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/configure.in b/configure.in -index a4f5fbb..ccf6e9f 100644 ---- a/configure.in -+++ b/configure.in -@@ -562,19 +562,27 @@ if test "$WCM_ENV_XFREE86" != yes; then - fi - AM_CONDITIONAL(WCM_ENV_XORGSDK, [test "$WCM_ENV_XORGSDK" = yes]) - --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 -- AC_MSG_RESULT([found, $WCM_XFREE86_DIR/$XFREE86SUBDIR]) -- WCM_ENV_XF86CONFIG=yes -- CFLAGS="$CFLAGS -I$WCM_XFREE86_DIR/$XFREE86SUBDIR" -- elif test -f $WCM_XORGSDK_DIR/xf86Parser.h; then -- AC_MSG_RESULT([found, $WCM_XORGSDK_DIR]) -- WCM_ENV_XF86CONFIG=yes -- elif test -f $WCM_XLIB_DIR/../include/xf86Parser.h; then -- AC_MSG_RESULT([found, $WCM_XLIB_DIR/../include]) -- WCM_ENV_XF86CONFIG=yes -- CFLAGS="$CFLAGS -I$WCM_XLIB_DIR/../include" -+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_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 -+ AC_MSG_RESULT([found, $WCM_XFREE86_DIR/$XFREE86SUBDIR]) -+ WCM_ENV_XF86CONFIG=yes -+ CFLAGS="$CFLAGS -I$WCM_XFREE86_DIR/$XFREE86SUBDIR" -+ elif test -f $WCM_XORGSDK_DIR/xf86Parser.h; then -+ AC_MSG_RESULT([found, $WCM_XORGSDK_DIR]) -+ WCM_ENV_XF86CONFIG=yes -+ elif test -f $WCM_XLIB_DIR/../include/xf86Parser.h; then -+ AC_MSG_RESULT([found, $WCM_XLIB_DIR/../include]) -+ WCM_ENV_XF86CONFIG=yes -+ CFLAGS="$CFLAGS -I$WCM_XLIB_DIR/../include" -+ fi - fi - fi -