hal: Branch 'master'

[David Zeuthen]

 configure.in           |    2 +-
 hald/linux/Makefile.am |    3 ++-
 hald/linux/osspec.c    |    5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
diff-tree fa195b8c58a1667e57233b7e1a5d28ded0049c06 (from bdf5a371843a08cfb1ca6993bce61d046431dd8e)
Author: Michael Biebl <mbiebl at gmail.com>
Date:   Tue Mar 13 15:58:09 2007 -0400

    inotify support for systems without sys/inotify.h

diff --git a/configure.in b/configure.in
index 3dd4162..80cd853 100644
--- a/configure.in
+++ b/configure.in
@@ -39,7 +39,7 @@ AM_PATH_PYTHON
 AC_SYS_LARGEFILE
 PKG_PROG_PKG_CONFIG
 
-AC_CHECK_HEADERS([sys/ioccom.h])
+AC_CHECK_HEADERS([sys/ioccom.h sys/inotify.h])
 
 AC_ARG_WITH(os-type,     [  --with-os-type=<os>     Distribution or OS (redhat)])
 AC_ARG_WITH(pid-file,    [  --with-pid-file=<file>  PID file for HAL daemon])
diff --git a/hald/linux/Makefile.am b/hald/linux/Makefile.am
index 315cd91..2ed2b27 100644
--- a/hald/linux/Makefile.am
+++ b/hald/linux/Makefile.am
@@ -28,7 +28,8 @@ libhald_linux_la_SOURCES =					\
 	device.h						\
 	device.c						\
 	blockdev.h						\
-	blockdev.c
+	blockdev.c						\
+	inotify_local.h
 
 if HAVE_ACPI
 libhald_linux_la_SOURCES +=					\
diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
index 5c2bed4..838ed80 100644
--- a/hald/linux/osspec.c
+++ b/hald/linux/osspec.c
@@ -43,7 +43,12 @@
 #include <sys/un.h>
 #include <sys/utsname.h>
 #include <unistd.h>
+
+#ifdef HAVE_SYS_INOTIFY_H
 #include <sys/inotify.h>
+#else
+#include "inotify_local.h"
+#endif
 
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>