hal configure.in,1.134,1.135 ChangeLog,1.928,1.929

[Kay Sievers]

Update of /cvs/hal/hal
In directory kemper:/tmp/cvs-serv4908

Modified Files:
	configure.in ChangeLog 
Log Message:
2006-07-11  Kay Sievers  <kay.sievers at vrfy.org>

        * configure.in:
        * hald/linux2/probing/Makefile.am:
        * hald/linux2/probing/probe-storage.c: (vid_log), (main):
        * hald/linux2/probing/probe-volume.c: (vid_log),
        (probe_msdos_part_table), (set_volume_id_values), (main):
        Depend on external shared version of libvolume_id.


Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- configure.in	15 Jun 2006 01:47:09 -0000	1.134
+++ configure.in	10 Jul 2006 23:47:42 -0000	1.135
@@ -180,7 +180,8 @@
 glib_module="glib-2.0 >= 2.6.0"
 dbus_module="dbus-1 >= 0.33"
 polkit_module="polkit >= 0.2"
-pkg_modules="$glib_module, gobject-2.0 >= 2.6.0, dbus-glib-1 >= 0.33, $dbus_module, $polkit_module"
+volume_id_module="libvolume_id >= 0.66"
+pkg_modules="$glib_module, gobject-2.0 >= 2.6.0, dbus-glib-1 >= 0.33, $dbus_module, $polkit_module, $volume_id_module"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 
 EXPAT_LIB=""
@@ -263,6 +264,11 @@
 AC_SUBST(POLKIT_CFLAGS)
 AC_SUBST(POLKIT_LIBS)
 
+# volume_id
+PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module])
+AC_SUBST(VOLUME_ID_CFLAGS)
+AC_SUBST(VOLUME_ID_LIBS)
+
 # Check for BLKGETSIZE64
 AC_CHECK_TYPE(pgoff_t, ,
               [AC_DEFINE(pgoff_t, unsigned long, [Index into the pagecache])],

Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.928
retrieving revision 1.929
diff -u -d -r1.928 -r1.929
--- ChangeLog	10 Jul 2006 23:34:47 -0000	1.928
+++ ChangeLog	10 Jul 2006 23:47:42 -0000	1.929
@@ -1,5 +1,14 @@
 2006-07-11  Kay Sievers  <kay.sievers at vrfy.org>
 
+	* configure.in:
+	* hald/linux2/probing/Makefile.am:
+	* hald/linux2/probing/probe-storage.c: (vid_log), (main):
+	* hald/linux2/probing/probe-volume.c: (vid_log),
+	(probe_msdos_part_table), (set_volume_id_values), (main):
+	Depend on external shared version of libvolume_id.
+
+2006-07-11  Kay Sievers  <kay.sievers at vrfy.org>
+
 	* hald/linux2/hotplug.c: (hotplug_event_begin_sysfs): Prepare for
 	new class devices showing up in /sys/devices instead of /sys/class.