From 6668e64766300742f45ed86ef87978efc8e08023 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 15 Jun 2007 15:24:20 +0000
Subject: [PATCH] Fri Jun 15 16:21:00 BST 2007 Richard W.M. Jones
 <rjones@redhat.com>

        * configure.in: Solaris header file fixes (Mark Johnson).
---
 ChangeLog            | 4 ++++
 configure.in         | 9 ++++++---
 src/proxy_internal.c | 1 +
 src/qemu_internal.c  | 7 +++++++
 src/virsh.c          | 1 +
 src/xen_unified.c    | 1 +
 src/xend_internal.c  | 1 +
 src/xm_internal.c    | 4 ++++
 tests/testutils.c    | 9 ++++++++-
 tests/virshtest.c    | 1 +
 10 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 570c6eb49f..b62efb8a6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 15 16:21:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
+
+	* configure.in: Solaris header file fixes (Mark Johnson).
+
 Fri Jun 15 14:42:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
 
 	* src/test.c, src/virsh.c, src/xend_internal.c, src/xm_internal.c:
diff --git a/configure.in b/configure.in
index 891da7fe79..4cee3a3b01 100644
--- a/configure.in
+++ b/configure.in
@@ -43,9 +43,6 @@ AC_PATH_PROG(TAR, tar, /bin/tar)
 AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xmllint)
 AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc)
 
-dnl Availability of various common functions.
-AC_CHECK_FUNCS([regexec])
-
 dnl Make sure we have an ANSI compiler
 AM_C_PROTOTYPES
 test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant)
@@ -56,6 +53,12 @@ AM_PROG_CC_C_O
 
 LIBVIRT_COMPILE_WARNINGS(maximum)
 
+dnl Availability of various common functions (non-fatal if missing).
+AC_CHECK_FUNCS([regexec])
+
+dnl Availability of various common headers (non-fatal if missing).
+AC_CHECK_HEADERS(paths.h)
+
 dnl Specific dir for HTML output ?
 AC_ARG_WITH(html-dir, AC_HELP_STRING([--with-html-dir=path],
             [path to base html directory, default $datadir/doc/html]),
diff --git a/src/proxy_internal.c b/src/proxy_internal.c
index 620cf1f4c1..7f2ed69d9f 100644
--- a/src/proxy_internal.c
+++ b/src/proxy_internal.c
@@ -18,6 +18,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
+#include <string.h>
 #include "internal.h"
 #include "driver.h"
 #include "proxy_internal.h"
diff --git a/src/qemu_internal.c b/src/qemu_internal.c
index d487d3e707..53043385c4 100644
--- a/src/qemu_internal.c
+++ b/src/qemu_internal.c
@@ -41,7 +41,14 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <limits.h>
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
+
+#ifndef _PATH_DEVNULL
+#define	_PATH_DEVNULL	"/dev/null"
+#endif
+
 
 #include "internal.h"
 #include "qemu_internal.h"
diff --git a/src/virsh.c b/src/virsh.c
index 3c96a2a1ba..be2af348d4 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -29,6 +29,7 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <locale.h>
+#include <limits.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
diff --git a/src/xen_unified.c b/src/xen_unified.c
index 8e913aeb19..bfc546e22a 100644
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -27,6 +27,7 @@
 
 #include <stdint.h>
 #include <unistd.h>
+#include <string.h>
 #include <sys/types.h>
 #include <xen/dom0_ops.h>
 
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 0a7736c997..c2d6e8db4f 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -28,6 +28,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <libxml/uri.h>
+#include <errno.h>
 
 #include "libvirt/libvirt.h"
 #include "driver.h"
diff --git a/src/xm_internal.c b/src/xm_internal.c
index fe8d04857f..e44fd2232e 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -26,6 +26,7 @@
 #include <dirent.h>
 #include <time.h>
 #include <sys/stat.h>
+#include <limits.h>
 
 #include <unistd.h>
 #include <stdint.h>
@@ -35,6 +36,9 @@
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
 
+#ifndef NAME_MAX
+#define	NAME_MAX	255
+#endif
 
 #include "xen_unified.h"
 #include "xm_internal.h"
diff --git a/tests/testutils.c b/tests/testutils.c
index b32716aaa5..76fe4d84aa 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -19,9 +19,16 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <paths.h>
 #include "testutils.h"
 
+#ifdef HAVE_PATHS_H
+#include <paths.h>
+#endif
+
+#ifndef _PATH_DEVNULL
+#define	_PATH_DEVNULL	"/dev/null"
+#endif
+
 #define GETTIMEOFDAY(T) gettimeofday(T, NULL)
 #define DIFF_MSEC(T, U)                                 \
     ((((int) ((T)->tv_sec - (U)->tv_sec)) * 1000000.0 +	\
diff --git a/tests/virshtest.c b/tests/virshtest.c
index a075f78f41..cc2a022301 100644
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <limits.h>
 
 #include "xml.h"
 #include "testutils.h"
-- 
GitLab