From f12a1995e42d098217fef22cba6e7158ed76e635 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Sun, 28 Feb 2010 18:33:08 +0100
Subject: bugfix: fixed problem that caused compilation on FreeBSD 9.0 to fail.

bugtracker: http://bugzilla.adiscon.com/show_bug.cgi?id=181
Thanks to Christiano for reporting.
---
 ChangeLog        | 6 ++++++
 configure.ac     | 2 +-
 tools/omusrmsg.c | 6 +++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6a6ae5fe..e754b005 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 ---------------------------------------------------------------------------
 Version 4.6.1  [v4-stable] (rgerhards), 2010-02-??
+- re-enabled old pipe output (using new module ompipe, built-in) after
+  some problems with pipes (and especially in regard to xconsole) were
+  discovered. Thanks to Michael Biebl for reporting the issues.
+- bugfix: fixed problem that caused compilation on FreeBSD 9.0 to fail.
+  bugtracker: http://bugzilla.adiscon.com/show_bug.cgi?id=181
+  Thanks to Christiano for reporting.
 ---------------------------------------------------------------------------
 Version 4.6.0  [v4-stable] (rgerhards), 2010-02-24
 ***************************************************************************
diff --git a/configure.ac b/configure.ac
index 7f8f38c3..b3d84b59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ AC_SUBST(DL_LIBS)
 AC_HEADER_RESOLV
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h syslog.h unistd.h utmp.h sys/epoll.h sys/prctl.h])
+AC_CHECK_HEADERS([arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h syslog.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c
index 499a11dd..fe3fb4d4 100644
--- a/tools/omusrmsg.c
+++ b/tools/omusrmsg.c
@@ -50,7 +50,11 @@
 #include <assert.h>
 #include <signal.h>
 #include <sys/param.h>
-#include <utmp.h>
+#ifdef HAVE_UTMP_X_H
+#  include <utmpx.h>
+#else
+#  include <utmp.h>
+#endif
 #include <unistd.h>
 #include <sys/uio.h>
 #include <sys/stat.h>
-- 
cgit