summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--util/configure.ac3
-rw-r--r--util/include/platforms/unix/axutil_unix.h2
-rw-r--r--util/src/platforms/unix/uuid_gen_unix.c4
3 files changed, 7 insertions, 2 deletions
diff --git a/util/configure.ac b/util/configure.ac
index 720b42c..0e1ed19 100644
--- a/util/configure.ac
+++ b/util/configure.ac
@@ -10,7 +10,6 @@ AC_PREFIX_DEFAULT(/usr/local/axis2_util)
dnl Checks for programs.
AC_PROG_CC
-AC_PROG_CXX
AC_PROG_CPP
AC_PROG_LIBTOOL
AC_PROG_INSTALL
@@ -62,6 +61,8 @@ dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
AC_CHECK_HEADERS([sys/socket.h])
+AC_CHECK_HEADERS([sys/sockio.h])
+AC_CHECK_HEADERS([getopt.h])
AC_CHECK_HEADERS([net/if.h], [], [],
[#include <stdio.h>
#if STDC_HEADERS
diff --git a/util/include/platforms/unix/axutil_unix.h b/util/include/platforms/unix/axutil_unix.h
index fa23eae..7a7e38c 100644
--- a/util/include/platforms/unix/axutil_unix.h
+++ b/util/include/platforms/unix/axutil_unix.h
@@ -116,7 +116,9 @@ extern "C"
#include "axutil_uuid_gen_unix.h" /* uuid_gen unix implementation */
#include <netinet/tcp.h> /* TCP_NODELAY */
#include <utime.h>
+#ifdef HAVE_GETOPT_H
#include <getopt.h>
+#endif /*HAVE_GETOPT_H*/
#include "axutil_date_time_util_unix.h"
/* for file access handling */
diff --git a/util/src/platforms/unix/uuid_gen_unix.c b/util/src/platforms/unix/uuid_gen_unix.c
index cdc2544..1941207 100644
--- a/util/src/platforms/unix/uuid_gen_unix.c
+++ b/util/src/platforms/unix/uuid_gen_unix.c
@@ -32,7 +32,9 @@
# include <linux/if.h>
#else
# ifdef HAVE_NET_IF_H
-# include <sys/sockio.h>
+# ifdef HAVE_SYS_SOCKIO_H
+# include <sys/sockio.h>
+# endif
# include <net/if.h>
# include <net/if_arp.h>
# endif