| 1 |
ikelos 09/07/28 15:50:06 |
| 2 |
|
| 3 |
Added: linuxwacom-0.8.3_p6-xf86config.patch |
| 4 |
Log: |
| 5 |
Version bump, temporarily removes buildable module support, fixes bug 274520. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-drivers/linuxwacom/files/linuxwacom-0.8.3_p6-xf86config.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/linuxwacom/files/linuxwacom-0.8.3_p6-xf86config.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/linuxwacom/files/linuxwacom-0.8.3_p6-xf86config.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: linuxwacom-0.8.3_p6-xf86config.patch |
| 15 |
=================================================================== |
| 16 |
diff --git a/configure.in b/configure.in |
| 17 |
index a4f5fbb..ccf6e9f 100644 |
| 18 |
--- a/configure.in |
| 19 |
+++ b/configure.in |
| 20 |
@@ -562,19 +562,27 @@ if test "$WCM_ENV_XFREE86" != yes; then |
| 21 |
fi |
| 22 |
AM_CONDITIONAL(WCM_ENV_XORGSDK, [test "$WCM_ENV_XORGSDK" = yes]) |
| 23 |
|
| 24 |
-AC_MSG_CHECKING(for lib xf86config) |
| 25 |
-if test -f $WCM_XLIB_DIR/libxf86config.a -o -f $WCM_XLIB_DIR/libxf86config.so; then |
| 26 |
- if test -f $WCM_XFREE86_DIR/$XFREE86SUBDIR/xf86Parser.h; then |
| 27 |
- AC_MSG_RESULT([found, $WCM_XFREE86_DIR/$XFREE86SUBDIR]) |
| 28 |
- WCM_ENV_XF86CONFIG=yes |
| 29 |
- CFLAGS="$CFLAGS -I$WCM_XFREE86_DIR/$XFREE86SUBDIR" |
| 30 |
- elif test -f $WCM_XORGSDK_DIR/xf86Parser.h; then |
| 31 |
- AC_MSG_RESULT([found, $WCM_XORGSDK_DIR]) |
| 32 |
- WCM_ENV_XF86CONFIG=yes |
| 33 |
- elif test -f $WCM_XLIB_DIR/../include/xf86Parser.h; then |
| 34 |
- AC_MSG_RESULT([found, $WCM_XLIB_DIR/../include]) |
| 35 |
- WCM_ENV_XF86CONFIG=yes |
| 36 |
- CFLAGS="$CFLAGS -I$WCM_XLIB_DIR/../include" |
| 37 |
+WCM_OPTION_XF86CONFIG=no |
| 38 |
+AC_ARG_ENABLE(xf86config, |
| 39 |
+ AC_HELP_STRING([--enable-xf86config], [Enable libxf86config support if present [[default=yes]]]), |
| 40 |
+ [ WCM_OPTION_XF86CONFIG=$enableval ], |
| 41 |
+ [ WCM_OPTION_XF86CONFIG=yes ]) |
| 42 |
+ |
| 43 |
+if test "$WCM_OPTION_XF86CONFIG" = yes; then |
| 44 |
+ AC_MSG_CHECKING(for lib xf86config) |
| 45 |
+ if test -f $WCM_XLIB_DIR/libxf86config.a -o -f $WCM_XLIB_DIR/libxf86config.so; then |
| 46 |
+ if test -f $WCM_XFREE86_DIR/$XFREE86SUBDIR/xf86Parser.h; then |
| 47 |
+ AC_MSG_RESULT([found, $WCM_XFREE86_DIR/$XFREE86SUBDIR]) |
| 48 |
+ WCM_ENV_XF86CONFIG=yes |
| 49 |
+ CFLAGS="$CFLAGS -I$WCM_XFREE86_DIR/$XFREE86SUBDIR" |
| 50 |
+ elif test -f $WCM_XORGSDK_DIR/xf86Parser.h; then |
| 51 |
+ AC_MSG_RESULT([found, $WCM_XORGSDK_DIR]) |
| 52 |
+ WCM_ENV_XF86CONFIG=yes |
| 53 |
+ elif test -f $WCM_XLIB_DIR/../include/xf86Parser.h; then |
| 54 |
+ AC_MSG_RESULT([found, $WCM_XLIB_DIR/../include]) |
| 55 |
+ WCM_ENV_XF86CONFIG=yes |
| 56 |
+ CFLAGS="$CFLAGS -I$WCM_XLIB_DIR/../include" |
| 57 |
+ fi |
| 58 |
fi |
| 59 |
fi |
Archives