From f50160a9e4c253c2b0a4f30df11d5f5376b4f736 Mon Sep 17 00:00:00 2001
From: Duncan Laurie <duncan@iceblink.org>
Date: Fri, 2 Sep 2005 17:56:27 +0000
Subject: [PATCH] fix portability issues

---
 ipmitool/configure.in    | 4 ++--
 ipmitool/lib/helper.c    | 5 ++++-
 ipmitool/lib/ipmi_tsol.c | 8 ++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ipmitool/configure.in b/ipmitool/configure.in
index a9fab62..13debc7 100644
--- a/ipmitool/configure.in
+++ b/ipmitool/configure.in
@@ -3,7 +3,7 @@ dnl autoconf for ipmitool
 dnl
 AC_INIT([src/ipmitool.c])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([ipmitool], [1.8.3])
+AM_INIT_AUTOMAKE([ipmitool], [1.8.3.5])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR([src/ipmitool.c])
 AC_PREREQ(2.50)
@@ -18,7 +18,7 @@ AC_CHECK_PROG([RPMBUILD], [rpmbuild], [rpmbuild], [rpm])
 AC_CHECK_PROG([SED], [sed], [sed])
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h string.h sys/ioctl.h sys/stat.h unistd.h])
+AC_CHECK_HEADERS([stdlib.h string.h sys/ioctl.h sys/stat.h unistd.h paths.h termios.h])
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/socket.h])
 AC_CHECK_HEADERS([sys/byteorder.h byteswap.h])
 
diff --git a/ipmitool/lib/helper.c b/ipmitool/lib/helper.c
index adf3c72..589ba6e 100644
--- a/ipmitool/lib/helper.c
+++ b/ipmitool/lib/helper.c
@@ -47,7 +47,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <paths.h>  /* For _PATH_TTY */
+
+#ifdef HAVE_PATHS_H
+# include <paths.h>  /* For _PATH_TTY */
+#endif
 
 #include <ipmitool/helper.h>
 #include <ipmitool/log.h>
diff --git a/ipmitool/lib/ipmi_tsol.c b/ipmitool/lib/ipmi_tsol.c
index 2bbf93a..a0361a8 100644
--- a/ipmitool/lib/ipmi_tsol.c
+++ b/ipmitool/lib/ipmi_tsol.c
@@ -39,8 +39,6 @@
 #include <sys/poll.h>
 #include <fcntl.h>
 #include <unistd.h>
-//#include <termios.h>
-#include <linux/termios.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -53,6 +51,12 @@
 #include <sys/select.h>
 #include <sys/time.h>
         
+#ifdef __linux__
+# include <linux/termios.h>
+#else
+# include <sys/termios.h>
+#endif
+
 #include <ipmitool/helper.h>
 #include <ipmitool/ipmi.h>
 #include <ipmitool/ipmi_intf.h>