From 4d269101a8c2f92b43bbf159297b6c1f0c5a451e Mon Sep 17 00:00:00 2001
From: Matt Fischer <matt.fischer@garmin.com>
Date: Wed, 20 Feb 2013 15:27:20 -0600
Subject: [PATCH] Add support for systems without syslog.h

This patch disables the use of syslog for systems which
do not have it, such as QNX.  Log messages are still
printed to stderr.
---
 dbus/dbus-sysdeps-util-unix.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index 6cff3fe..7beab20 100644
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -49,7 +49,10 @@
 #include <sys/socket.h>
 #include <dirent.h>
 #include <sys/un.h>
+
+#ifdef HAVE_SYSLOG_H
 #include <syslog.h>
+#endif
 
 #ifdef HAVE_SYS_SYSLIMITS_H
 #include <sys/syslimits.h>
@@ -425,11 +428,15 @@ _dbus_request_file_descriptor_limit (unsigned int limit)
 void
 _dbus_init_system_log (void)
 {
+#ifdef HAVE_SYSLOG_H
+
 #if HAVE_DECL_LOG_PERROR
   openlog ("dbus", LOG_PID | LOG_PERROR, LOG_DAEMON);
 #else
   openlog ("dbus", LOG_PID, LOG_DAEMON);
 #endif
+
+#endif
 }
 
 /**
@@ -465,6 +472,7 @@ _dbus_system_log (DBusSystemLogSeverity severity, const char *msg, ...)
 void
 _dbus_system_logv (DBusSystemLogSeverity severity, const char *msg, va_list args)
 {
+#ifdef HAVE_SYSLOG_H
   int flags;
   switch (severity)
     {
@@ -481,7 +489,10 @@ _dbus_system_logv (DBusSystemLogSeverity severity, const char *msg, va_list args
         return;
     }
 
-#ifndef HAVE_DECL_LOG_PERROR
+  vsyslog (flags, msg, args);
+#endif
+
+#if !defined(HAVE_SYSLOG_H) || !HAVE_DECL_LOG_PERROR
     {
       /* vsyslog() won't write to stderr, so we'd better do it */
       va_list tmp;
@@ -494,8 +505,6 @@ _dbus_system_logv (DBusSystemLogSeverity severity, const char *msg, va_list args
     }
 #endif
 
-  vsyslog (flags, msg, args);
-
   if (severity == DBUS_SYSTEM_LOG_FATAL)
     exit (1);
 }
-- 
1.8.0.msysgit.0