hal: Branch 'master'

[Kay Sievers]

 configure.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 383bad1002bf566688cf27863802e8009eb04c93
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Wed Jul 22 12:29:16 2009 +0200

    configure.in: require blkid >= 2.15 from util-linux-ng

diff --git a/configure.in b/configure.in
index 082c9e8..3bcc181 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61"
 dbus_module="dbus-1 >= 0.61"
-blkid_module="blkid >= 1.43"
+blkid_module="blkid >= 2.15"
 polkit_module="polkit >= 0.5"
 
 # libtool versioning - this applies to libhal and libhal-storage
@@ -686,7 +686,7 @@ else
 fi
 AC_MSG_RESULT($have_glib_2_14)
 
-# blkid
+# blkid (util-linux-ng)
 case "$host" in
 *-*-solaris*)
 	;;