[patch] Fix configure glitch on Solaris

[patch] Fix configure glitch on Solaris

[Eric Botcazou]

[-- Attachment #1: Type: text/plain, Size: 505 bytes --]

Hi,

natVMNetworkInterfacePosix.cc fails to compile under Solaris because 'struct 
ifconf' is not defined because net/if.h is not included, the root problem 
being that net/if.h requires sys/socket.h and the configure machinery doesn't 
provide it.

Hence the attached patch, tested on SPARC/Solaris 9 and AMD64/Linux.  OK for 
mainline?


2009-12-06  Eric Botcazou  <ebotcazou@adacore.com>

	* configure.ac (net/if.h check): Include sys/socket.h if present.
	* configure: Regenerate.


-- 
Eric Botcazou

[-- Attachment #2: solaris_libjava.diff --]
[-- Type: text/x-diff, Size: 957 bytes --]

Index: configure.ac
===================================================================
--- configure.ac	(revision 155009)
+++ configure.ac	(working copy)
@@ -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 <sys/socket.h>
+#endif
+])
+
 AC_CHECK_HEADERS(inttypes.h, [
     AC_DEFINE(HAVE_INTTYPES_H, 1, [Define if <inttypes.h> is available])
     AC_DEFINE(JV_HAVE_INTTYPES_H, 1, [Define if <inttypes.h> is available])

Re: [patch] Fix configure glitch on Solaris

[Andrew Haley]

Eric Botcazou wrote:
> Hi,
> 
> natVMNetworkInterfacePosix.cc fails to compile under Solaris because 'struct 
> ifconf' is not defined because net/if.h is not included, the root problem 
> being that net/if.h requires sys/socket.h and the configure machinery doesn't 
> provide it.
> 
> Hence the attached patch, tested on SPARC/Solaris 9 and AMD64/Linux.  OK for 
> mainline?
> 
> 
> 2009-12-06  Eric Botcazou  <ebotcazou@adacore.com>
> 
> 	* configure.ac (net/if.h check): Include sys/socket.h if present.
> 	* configure: Regenerate.

Sure.

Thanks,
Andrew.