[gnome-control-center] wacom: Wacom isn't optional on supported platforms

[Bastien Nocera <hadess src gnome org>]

commit edf60cdd3b11c45d0437515b72d56176bc1855ad
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Apr 16 10:28:20 2014 +0200

    wacom: Wacom isn't optional on supported platforms
    
    d78bc977 wrongly made the Wacom panel optional on supported platforms.
    Restore the original behaviour which is to require the Wacom panel to be
    built on all Linux versions (except s390 which doesn't have USB
    support).
    
    See https://bugzilla.gnome.org/show_bug.cgi?id=728318

 configure.ac |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4100481..28480e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -297,11 +297,9 @@ case $host_os in
                         xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
                         gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
                         clutter-gtk-1.0
-                        clutter-1.0 >= $CLUTTER_REQUIRED_VERSION, [have_wacom=yes], [have_wacom=no])
-      if test x${have_wacom} = xyes; then
-        AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
-        AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
-      fi
+                        clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+      AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+      AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
     fi
     ;;
   *)