Make gusb a hard requirement

There's no testing being done on this configuration now.

8 files changed, 1 insertions, 32 deletions

diff --git a/configure.ac b/configure.ac
index 86b4efb..198563e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,14 +162,7 @@ AC_ARG_ENABLE(session_helper, AS_HELP_STRING([--enable-session-helper],[Enable S
 	      enable_session_helper=$enableval, enable_session_helper=$enable_unix)
 AM_CONDITIONAL(HAVE_SESSION_HELPER, test x$enable_session_helper = xyes)
 
-AC_ARG_ENABLE(gusb, AS_HELP_STRING([--enable-gusb],[Enable GUSB support]),
-	      enable_gusb=$enableval, enable_gusb=yes)
-if test x$enable_gusb != xno; then
-	PKG_CHECK_MODULES(GUSB, gusb >= 0.2.7)
-	AC_DEFINE(HAVE_GUSB,1,[whether gusb is available])
-fi
-AM_CONDITIONAL(HAVE_GUSB, test x$enable_gusb = xyes)
-
+PKG_CHECK_MODULES(GUSB, gusb >= 0.2.7)
 PKG_CHECK_MODULES(LCMS, lcms2 >= 2.6)
 
 PKG_CHECK_MODULES(SQLITE, sqlite3)
@@ -476,7 +469,6 @@ echo "
         Reverse engineering tools: ${enable_reverse}
         BASH completion support:   ${enable_bash_completion}
         SANE support:              ${has_sane}
-        GUsb support:              ${enable_gusb}
         Extra print profiles:      ${enable_print_profiles}
         Install tests:             ${enable_installed_tests}
         ArgyllCMS sensor:          ${enable_argyllcms_sensor}
diff --git a/lib/Makefile.am b/lib/Makefile.am
index bc803e2..b0e96e2 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,9 +6,7 @@ SUBDIRS +=						\
 	compat
 endif
 
-if HAVE_GUSB
 SUBDIRS +=						\
 	colorhug
-endif
 
 -include $(top_srcdir)/git.mk
diff --git a/src/cd-sensor.c b/src/cd-sensor.c
index b05f53a..347c5f7 100644
--- a/src/cd-sensor.c
+++ b/src/cd-sensor.c
@@ -103,9 +103,7 @@ typedef struct
 	CdSensorIface			*desc;
 	GHashTable			*options;
 	GHashTable			*metadata;
-#ifdef HAVE_GUSB
 	GUsbContext			*usb_ctx;
-#endif
 } CdSensorPrivate;
 
 enum {
@@ -1221,7 +1219,6 @@ cd_sensor_get_usb_path (CdSensor *sensor)
 	return priv->usb_path;
 }
 
-#ifdef HAVE_GUSB
 GUsbDevice *
 cd_sensor_open_usb_device (CdSensor *sensor,
 			   gint config,
@@ -1253,7 +1250,6 @@ cd_sensor_open_usb_device (CdSensor *sensor,
 	}
 	return g_object_ref (device);
 }
-#endif
 
 void
 cd_sensor_add_cap (CdSensor *sensor, CdSensorCap cap)
@@ -1602,9 +1598,7 @@ cd_sensor_init (CdSensor *sensor)
 	CdSensorPrivate *priv = GET_PRIVATE (sensor);
 	priv->state = CD_SENSOR_STATE_IDLE;
 	priv->mode = CD_SENSOR_CAP_UNKNOWN;
-#ifdef HAVE_GUSB
 	priv->usb_ctx = g_usb_context_new (NULL);
-#endif
 	priv->options = g_hash_table_new_full (g_str_hash,
 					       g_str_equal,
 					       (GDestroyNotify) g_free,
@@ -1640,9 +1634,7 @@ cd_sensor_finalize (GObject *object)
 	g_free (priv->usb_path);
 	g_hash_table_unref (priv->options);
 	g_hash_table_unref (priv->metadata);
-#ifdef HAVE_GUSB
 	g_object_unref (priv->usb_ctx);
-#endif
 	if (priv->device != NULL)
 		g_object_unref (priv->device);
 
diff --git a/src/cd-sensor.h b/src/cd-sensor.h
index 86b57e8..b01795b 100644
--- a/src/cd-sensor.h
+++ b/src/cd-sensor.h
@@ -29,10 +29,7 @@
 #include <colord-private.h>
 
 #include <gudev/gudev.h>
-
-#ifdef HAVE_GUSB
 #include <gusb.h>
-#endif
 
 #include "cd-common.h"
 
@@ -75,12 +72,10 @@ gboolean	 cd_sensor_set_from_device	(CdSensor		*sensor,
 GUdevDevice	*cd_sensor_get_device		(CdSensor		*sensor);
 void		 cd_sensor_set_index		(CdSensor		*sensor,
 						 guint			 idx);
-#ifdef HAVE_GUSB
 GUsbDevice	*cd_sensor_open_usb_device	(CdSensor		*sensor,
 						 gint			 config,
 						 gint			 interface,
 						 GError			**error);
-#endif
 void		 cd_sensor_button_pressed	(CdSensor		*sensor);
 gboolean	 cd_sensor_dump			(CdSensor		*sensor,
 						 GString		*data,
diff --git a/src/sensors/colorhug/Makefile.am b/src/sensors/colorhug/Makefile.am
index 95ae47d..91ee841 100644
--- a/src/sensors/colorhug/Makefile.am
+++ b/src/sensors/colorhug/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS =						\
 	-DG_USB_API_IS_SUBJECT_TO_CHANGE		\
 	-DLOCALEDIR=\""$(localedir)"\"
 
-if HAVE_GUSB
 plugindir = $(libdir)/colord-sensors
 plugin_LTLIBRARIES =					\
 	libcolord_sensor_colorhug.la
@@ -25,6 +24,5 @@ libcolord_sensor_colorhug_la_LIBADD =			\
 	$(top_builddir)/lib/colorhug/libcolorhug.la
 libcolord_sensor_colorhug_la_LDFLAGS = -module -avoid-version
 libcolord_sensor_colorhug_la_CFLAGS = $(WARN_CFLAGS)
-endif
 
 -include $(top_srcdir)/git.mk
diff --git a/src/sensors/dtp94/Makefile.am b/src/sensors/dtp94/Makefile.am
index 0b688ab..39f0349 100644
--- a/src/sensors/dtp94/Makefile.am
+++ b/src/sensors/dtp94/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS =						\
 	-DG_USB_API_IS_SUBJECT_TO_CHANGE		\
 	-DLOCALEDIR=\""$(localedir)"\"
 
-if HAVE_GUSB
 plugindir = $(libdir)/colord-sensors
 plugin_LTLIBRARIES =					\
 	libcolord_sensor_dtp94.la
@@ -28,6 +27,5 @@ libcolord_sensor_dtp94_la_LIBADD =			\
 	$(GUSB_LIBS)
 libcolord_sensor_dtp94_la_LDFLAGS = -module -avoid-version
 libcolord_sensor_dtp94_la_CFLAGS = $(WARN_CFLAGS)
-endif
 
 -include $(top_srcdir)/git.mk
diff --git a/src/sensors/huey/Makefile.am b/src/sensors/huey/Makefile.am
index 1d1cb9e..b4661a2 100644
--- a/src/sensors/huey/Makefile.am
+++ b/src/sensors/huey/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS =						\
 	-DG_USB_API_IS_SUBJECT_TO_CHANGE		\
 	-DLOCALEDIR=\""$(localedir)"\"
 
-if HAVE_GUSB
 plugindir = $(libdir)/colord-sensors
 plugin_LTLIBRARIES =					\
 	libcolord_sensor_huey.la
@@ -30,6 +29,5 @@ libcolord_sensor_huey_la_LIBADD =			\
 	$(GUSB_LIBS)
 libcolord_sensor_huey_la_LDFLAGS = -module -avoid-version
 libcolord_sensor_huey_la_CFLAGS = $(WARN_CFLAGS)
-endif
 
 -include $(top_srcdir)/git.mk
diff --git a/src/sensors/spark/Makefile.am b/src/sensors/spark/Makefile.am
index cb65f0e..a1163c5 100644
--- a/src/sensors/spark/Makefile.am
+++ b/src/sensors/spark/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS =						\
 	-DG_USB_API_IS_SUBJECT_TO_CHANGE		\
 	-DLOCALEDIR=\""$(localedir)"\"
 
-if HAVE_GUSB
 plugindir = $(libdir)/colord-sensors
 plugin_LTLIBRARIES =					\
 	libcolord_sensor_spark.la
@@ -28,6 +27,5 @@ libcolord_sensor_spark_la_LIBADD =			\
 	$(GUSB_LIBS)
 libcolord_sensor_spark_la_LDFLAGS = -module -avoid-version
 libcolord_sensor_spark_la_CFLAGS = $(WARN_CFLAGS)
-endif
 
 -include $(top_srcdir)/git.mk