Skip to content

Commit 5e2a8ba

Browse files
committed
2010-04-26 Zoltan Varga <[email protected]>
* configure.in: Applied patch from Robert Nagy ([email protected]). Add sys/param.h dependencies to a few checks. svn path=/branches/mono-2-6/mono/; revision=156098
1 parent c2c048d commit 5e2a8ba

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2010-04-26 Zoltan Varga <[email protected]>
2+
3+
* configure.in: Applied patch from Robert Nagy ([email protected]). Add
4+
sys/param.h dependencies to a few checks.
5+
16
2010-04-21 Andrés G. Aragoneses <[email protected]>
27

38
* configure.in: Propagate DISABLE_MCS_DOCS to makefiles so mono/docs

configure.in

+22-2
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,14 @@ fi
327327
AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
328328

329329
AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h)
330-
AC_CHECK_HEADERS(sys/user.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h asm/sigcontext.h)
330+
AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h)
331331

332+
AC_CHECK_HEADERS(sys/user.h, [], [],
333+
[
334+
#ifdef HAVE_SYS_PARAM_H
335+
# include <sys/param.h>
336+
#endif
337+
])
332338

333339
AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
334340
if test x$have_zlib = xyes; then
@@ -1509,7 +1515,15 @@ if test x$platform_win32 = xno; then
15091515
dnl *** Checks for SIOCGIFCONF ***
15101516
dnl ******************************
15111517
AC_CHECK_HEADERS(sys/ioctl.h)
1512-
AC_CHECK_HEADERS(net/if.h)
1518+
AC_CHECK_HEADERS(net/if.h, [], [],
1519+
[
1520+
#ifdef HAVE_SYS_TYPES_H
1521+
# include <sys/types.h>
1522+
#endif
1523+
#ifdef HAVE_SYS_SOCKET_H
1524+
# include <sys/socket.h>
1525+
#endif
1526+
])
15131527
AC_MSG_CHECKING(for ifreq)
15141528
AC_TRY_COMPILE([
15151529
#include <stdio.h>
@@ -1573,6 +1587,12 @@ if test x$platform_win32 = xno; then
15731587
AC_CHECK_HEADERS(sys/xattr.h)
15741588
AC_CHECK_HEADERS(sys/mman.h)
15751589
AC_CHECK_HEADERS(sys/param.h)
1590+
AC_CHECK_HEADERS(sys/mount.h, [], [],
1591+
[
1592+
#ifdef HAVE_SYS_PARAM_H
1593+
# include <sys/param.h>
1594+
#endif
1595+
])
15761596
AC_CHECK_HEADERS(sys/mount.h)
15771597
AC_CHECK_FUNCS(confstr)
15781598
AC_CHECK_FUNCS(seekdir telldir)

0 commit comments

Comments
 (0)