hal: Branch 'master'

[David Zeuthen]

 hald/linux/probing/Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 6f5b3987d668863d1b1338bcac3a9e6390dbcaf7 (from 32f7eae981dd186ec5eb2a3fdeec1fc9c11c0436)
Author: Frederic Peters <fpeters at 0d.be>
Date:   Tue Mar 27 13:17:02 2007 -0400

    use VOLUME_ID_CFLAGS
    
    GNOME is in the process of updating hal requirement from 0.5.7.1 to
    0.5.8.1; main blocker was libvolume_id which could not be built with
    jhbuild (this is bug 415694[1]).
    
    Once this bug is fixed there are three problems with 0.5.8.1 (see [2])
    but two of them have already been fixed in git.
    
    The remaining problem is hald/linux/probing/Makefile.am missing
    @VOLUME_ID_CFLAGS@ in its INCLUDES= line.
    
    Patch attached.
    
    Regards,
    
            Frederic
    
    [1] http://bugzilla.gnome.org/show_bug.cgi?id=415694
    [2] http://bugzilla.gnome.org/show_bug.cgi?id=415694#c11

diff --git a/hald/linux/probing/Makefile.am b/hald/linux/probing/Makefile.am
index 6919e64..1744d28 100644
--- a/hald/linux/probing/Makefile.am
+++ b/hald/linux/probing/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
 	-I$(top_srcdir) \
-	@GLIB_CFLAGS@ @DBUS_CFLAGS@
+	@GLIB_CFLAGS@ @DBUS_CFLAGS@ @VOLUME_ID_CFLAGS@
 
 if HALD_COMPILE_LINUX
 libexec_PROGRAMS = hald-probe-input hald-probe-hiddev hald-probe-storage hald-probe-volume hald-probe-printer \