hal: Branch 'master'

[David Zeuthen]

 configure.in                               |    2 +-
 hald/linux/addons/Makefile.am              |    2 +-
 hald/linux/addons/addon-cpufreq.c          |    2 +-
 hald/linux/addons/addon-dell-backlight.cpp |    2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

New commits:
diff-tree cdca0a7dc663d5e174e811b2c17afd7491537aa2 (from 5f7de8756eb51d4418c6304f8be0b2c1d41f2a20)
Author: William Jon McCann <mccann at jhu.edu>
Date:   Wed Jan 10 16:43:45 2007 -0500

    build fixes

diff --git a/configure.in b/configure.in
index 2af5a01..54639de 100644
--- a/configure.in
+++ b/configure.in
@@ -522,7 +522,7 @@ BUILD_MACBOOKPRO=no
 if test "x$with_macbookpro" = "xyes" ; then
    BUILD_MACBOOKPRO=yes
 elif test "x$with_macbookpro" = "x" ; then
-  if test "$HAVE_LIBPCI" != "false" ; then
+  if test "x$USE_LIBPCI" != "xno" ; then
     case "${HALD_BACKEND}" in
       linux)
         case "${host}" in
diff --git a/hald/linux/addons/Makefile.am b/hald/linux/addons/Makefile.am
index 7c8c5d9..32bfb4d 100644
--- a/hald/linux/addons/Makefile.am
+++ b/hald/linux/addons/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@ @POLKIT_CFLAGS@
 
 if HALD_COMPILE_LINUX
 libexec_PROGRAMS  = 			\
diff --git a/hald/linux/addons/addon-cpufreq.c b/hald/linux/addons/addon-cpufreq.c
index c8eedb9..55ec828 100644
--- a/hald/linux/addons/addon-cpufreq.c
+++ b/hald/linux/addons/addon-cpufreq.c
@@ -40,7 +40,7 @@
 #include "../../logger.h"
 
 #ifdef HAVE_POLKIT
-#include <libpolkit/libpolkit.h>
+#include <libpolkit.h>
 #endif
 
 #define MAX_LINE_SIZE				255
diff --git a/hald/linux/addons/addon-dell-backlight.cpp b/hald/linux/addons/addon-dell-backlight.cpp
index 254d492..da5fd3c 100644
--- a/hald/linux/addons/addon-dell-backlight.cpp
+++ b/hald/linux/addons/addon-dell-backlight.cpp
@@ -23,6 +23,8 @@
  *
  **************************************************************************/
 
+#include <config.h>
+
 #include <glib/gmain.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>