hal: Branch 'master'

[Richard Hughes]

 hald/linux/addons/Makefile.am |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

New commits:
diff-tree 52a3bc52d6ce8f5fdc59320a458cfbc3d8e6da1b (from e3df19e31075ab095d585f69a3bb62a707622b53)
Author: Richard Hughes <richard at hughsie.com>
Date:   Sun Dec 17 17:32:23 2006 +0000

    only build the pmu addon when we use pmu
    
    We should only build the hald-addon-pmu addon when HAVE_PMU
    defined in configure. Trivial fix.

diff --git a/hald/linux/addons/Makefile.am b/hald/linux/addons/Makefile.am
index 87bc0de..aa23f6e 100644
--- a/hald/linux/addons/Makefile.am
+++ b/hald/linux/addons/Makefile.am
@@ -12,9 +12,13 @@ if HALD_COMPILE_LINUX
 libexec_PROGRAMS  = 			\
 	hald-addon-hid-ups 		\
 	hald-addon-keyboard 		\
-	hald-addon-pmu			\
 	hald-addon-storage
 
+if HAVE_PMU
+libexec_PROGRAMS  += 			\
+	hald-addon-pmu
+endif
+
 if HAVE_ACPI
 libexec_PROGRAMS  += 			\
 	hald-addon-acpi 		\