diff options
| author | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-12-07 09:44:22 +0000 |
|---|---|---|
| committer | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-12-07 09:44:22 +0000 |
| commit | 20c1cf377d7a113bcc651950f46fb8be970e5176 (patch) | |
| tree | 30f79a31f574b63638fff5bc2ed2b2c06060f48b /libjava | |
| parent | 65b88e933befb87629e75b8f42e92a54f8f3fe52 (diff) | |
| download | gcc-20c1cf377d7a113bcc651950f46fb8be970e5176.tar.gz | |
* configure.ac (net/if.h check): Include sys/socket.h if present.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155034 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rwxr-xr-x | libjava/configure | 22 | ||||
| -rw-r--r-- | libjava/configure.ac | 10 |
3 files changed, 35 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 651242832be..8a89adcaa40 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2009-12-07 Eric Botcazou <ebotcazou@adacore.com> + + * configure.ac (net/if.h check): Include sys/socket.h if present. + * configure: Regenerate. + 2009-12-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * Makefile.in: Regenerate. diff --git a/libjava/configure b/libjava/configure index 906420e1af5..9c1e00ac2ba 100755 --- a/libjava/configure +++ b/libjava/configure @@ -23506,7 +23506,7 @@ esac # for now. If you change this, you also must update natFile.cc. for ac_header in 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 do : @@ -23522,6 +23522,26 @@ fi done + +# sys/socket.h is a prerequisite for net/if.h on Solaris. +for ac_header in net/if.h +do : + ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" " +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif + +" +if test "x$ac_cv_header_net_if_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NET_IF_H 1 +_ACEOF + +fi + +done + + for ac_header in inttypes.h do : ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" diff --git a/libjava/configure.ac b/libjava/configure.ac index b2037d28152..42c84ec611e 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 <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]) |