hal/hald/linux2/addons Makefile.am,1.4,1.5

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux2/addons
In directory gabe:/tmp/cvs-serv25722/hald/linux2/addons

Modified Files:
	Makefile.am 
Log Message:
2005-04-04  David Zeuthen  <davidz at redhat.com>

	* hald/linux2/addons/Makefile.am (libexec_PROGRAMS): Only build
	hald-addon-usb-csr if we have libusb

	* configure.in: Check for libusb (since it appear not to build
	on s390/s390x if we don't have it)

2005-04-04  David Zeuthen  <davidz at redhat.com>

	* hald/linux2/probing/probe-storage.c (main): storage.serial and
	storage.firmware_revision may return bogus data so don't quit
	if we fail when setting it (Red Hat bug #151762)



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	24 Mar 2005 01:15:31 -0000	1.4
+++ Makefile.am	5 Apr 2005 16:31:31 -0000	1.5
@@ -8,7 +8,11 @@
 	-I$(top_srcdir) \
 	@PACKAGE_CFLAGS@
 
-libexec_PROGRAMS = hald-addon-hid-ups hald-addon-acpi hald-addon-storage hald-addon-usb-csr
+libexec_PROGRAMS  = hald-addon-hid-ups hald-addon-acpi hald-addon-storage
+
+if HAVE_LIBUSB
+libexec_PROGRAMS += hald-addon-usb-csr
+endif
 
 hald_addon_hid_ups_SOURCES = addon-hid-ups.c
 hald_addon_hid_ups_LDADD = $(top_builddir)/libhal/libhal.la
@@ -19,5 +23,7 @@
 hald_addon_storage_SOURCES = addon-storage.c
 hald_addon_storage_LDADD = $(top_builddir)/libhal/libhal.la
 
+if HAVE_LIBUSB
 hald_addon_usb_csr_SOURCES = addon-usb-csr.c
 hald_addon_usb_csr_LDADD = $(top_builddir)/libhal/libhal.la -lusb @PACKAGE_LIBS@
+endif