hal: Branch 'master'

[David Zeuthen]

 tools/Makefile.am |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

New commits:
diff-tree 6124fb56eb8a96750c18a2986f952de0d0f9c179 (from 24b151cd176dc8b2e53209be24bb64c647e65179)
Author: Guillem Jover <guillem.jover at nokia.com>
Date:   Thu Feb 15 14:19:08 2007 -0500

    respect --disable-pmu for hal-system-power-pmu
    
    Currently hal-system-power-pmu is built and installed even when
    '--disable-pmu' is used.

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 037b4aa..96844ce 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -55,8 +55,12 @@ libexec_PROGRAMS =                      
 	hal-storage-eject	            \
 	hal-storage-closetray	            \
 	hal-storage-cleanup-mountpoint      \
-	hal-storage-cleanup-all-mountpoints \
+	hal-storage-cleanup-all-mountpoints
+
+if HAVE_PMU
+libexec_PROGRAMS +=			    \
 	hal-system-power-pmu
+endif
 
 if HAVE_ACLMGMT
 libexec_PROGRAMS += hal-acl-add hal-acl-remove
@@ -85,8 +89,10 @@ hal_storage_cleanup_mountpoint_LDADD = @
 hal_storage_cleanup_all_mountpoints_SOURCES = hal-storage-cleanup-all-mountpoints.c hal-storage-shared.c hal-storage-shared.h
 hal_storage_cleanup_all_mountpoints_LDADD = @GLIB_LIBS@ @POLKIT_LIBS@ @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la $(top_builddir)/libhal-storage/libhal-storage.la
 
+if HAVE_PMU
 hal_system_power_pmu_SOURCES = hal-system-power-pmu.c
 hal_system_power_pmu_LDADD = @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
+endif
 
 scriptdir = $(libdir)/hal/scripts