OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Eric Botcazou 2009-12-07 09:44:22 +00:00 committed by Eric Botcazou
parent 4afd0ef449
commit 9e8b671ccc
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -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.

22
libjava/configure vendored
View File

@ -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"

10
libjava/configure.ac
View File

@ -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])