[gnome-settings-daemon] wacom: gudev support isn't optional on Linux systems



commit 4b8ed325e861f6a24ea75e6d0abdb79246267d06
Author: Bastien Nocera <hadess hadess net>
Date:   Fri May 25 12:26:44 2012 +0100

    wacom: gudev support isn't optional on Linux systems
    
    As it's necessary for Wacom support.

 configure.ac |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 923d3e5..5f7bbcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,7 @@ dnl ---------------------------------------------------------------------------
 dnl - GUdev integration (default enabled)
 dnl ---------------------------------------------------------------------------
 GUDEV_PKG=""
-AC_ARG_ENABLE(gudev, AS_HELP_STRING([--disable-gudev],[Disable GUdev support]), enable_gudev=$enableval)
+AC_ARG_ENABLE(gudev, AS_HELP_STRING([--disable-gudev],[Disable GUdev support (not optional on Linux platforms)]), enable_gudev=$enableval)
 if test x$enable_gudev != xno; then
 	PKG_CHECK_MODULES(GUDEV, gudev-1.0, HAVE_GUDEV="yes", HAVE_GUDEV="no")
 	if test "x$HAVE_GUDEV" = "xyes"; then
@@ -205,7 +205,11 @@ case $host_os in
     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
       have_wacom=no
     else
-      PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
+      if test x$enable_gudev != xno; then
+        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
+      else
+        AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+      fi
       have_wacom=yes
     fi
     ;;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]