hal ChangeLog,1.498,1.499 configure.in,1.73,1.74

[David Zeuthen]

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

Modified Files:
	ChangeLog configure.in 
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: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -d -r1.498 -r1.499
--- ChangeLog	4 Apr 2005 18:03:23 -0000	1.498
+++ ChangeLog	5 Apr 2005 16:31:31 -0000	1.499
@@ -1,5 +1,19 @@
 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)
+
+2005-04-04  David Zeuthen  <davidz at redhat.com>
+
 	* fdi/information/10freedesktop/10-wireless-mice.fdi: Change 
 	battery.type from 'keyboard_mouse' to just 'keyboard'.
 

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- configure.in	4 Apr 2005 16:00:59 -0000	1.73
+++ configure.in	5 Apr 2005 16:31:31 -0000	1.74
@@ -3,7 +3,7 @@
 # If porting the hal tarball to work well on a distribution search
 # for the string "(distro-tweaks required)" for what to tweak.
 #
-# Patches for that are welcome.
+# Patches for that is welcome.
 #
 
 AC_PREREQ(2.57)
@@ -204,6 +204,16 @@
 AC_CHECK_LIB(expat,XML_ParserCreate, EXPAT_LIB="-lexpat")
 AC_SUBST(EXPAT_LIB)
 
+dnl Check libusb
+AC_PATH_PROG(LIBUSB_CONFIG, libusb-configxxx)
+if test -n "${LIBUSB_CONFIG}"; then
+	AM_CONDITIONAL(HAVE_LIBUSB,true)
+else
+	AM_CONDITIONAL(HAVE_LIBUSB,false)
+fi
+
+
+
 AC_ARG_WITH(backend, [  --with-backend=<name>   Backend to use (linux2/dummy)],
                       [
                       backend=$withval