From 9e8b671cccdceb1b21931557719e0a729e6c6c16 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Mon, 7 Dec 2009 09:44:22 +0000 Subject: configure.ac (net/if.h check): Include sys/socket.h if present. * configure.ac (net/if.h check): Include sys/socket.h if present. * configure: Regenerate. From-SVN: r155034 --- libjava/configure.ac | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'libjava/configure.ac') diff --git a/libjava/configure.ac b/libjava/configure.ac index b2037d2..42c84ec 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1568,9 +1568,17 @@ TL_AC_GXX_INCLUDE_DIR # for now. If you change this, you also must update natFile.cc. AC_CHECK_HEADERS([unistd.h bstring.h sys/time.h sys/types.h fcntl.h \ sys/ioctl.h sys/filio.h sys/stat.h sys/select.h \ - sys/socket.h netinet/in.h arpa/inet.h netdb.h net/if.h \ + sys/socket.h netinet/in.h arpa/inet.h netdb.h \ pwd.h sys/config.h stdint.h langinfo.h locale.h \ dirent.h sys/rw_lock.h magic.h ifaddrs.h]) + +# sys/socket.h is a prerequisite for net/if.h on Solaris. +AC_CHECK_HEADERS(net/if.h, [], [], [ +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +]) + AC_CHECK_HEADERS(inttypes.h, [ AC_DEFINE(HAVE_INTTYPES_H, 1, [Define if is available]) AC_DEFINE(JV_HAVE_INTTYPES_H, 1, [Define if is available]) -- cgit v1.1