2005-04-08 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* configure.in: define FD_SETSIZE=1024 on windows (the default is only
	64). Re-add aio_* stuff. Shouldn't have removed it.

svn path=/trunk/mono/; revision=42724

diff --git a/ChangeLog b/ChangeLog
index 7a292c97b369ccdb3779a034257bb7c44b035961..14fdf3f3a109e021f53b3a1f190bbafd3223052c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-08 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * configure.in: define FD_SETSIZE=1024 on windows (the default is only
+       64). Re-add aio_* stuff. Shouldn't have removed it.
+
 2005-04-07 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * configure.in: no more checks for aio_*.

diff --git a/configure.in b/configure.in
index 70e9e0f6f51b1fa99857c91078dfe5d27bf3e042..28ee637f78f95d301df8bbb1d81c8539204b4511 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -60,7 +60,7 @@ case "$host" in
                export CC
 # latest libgc already defines GC_WIN32_THREADS
 #              CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS -DWIN32_THREADS"
-               CPPFLAGS="$CPPFLAGS -DWIN32_THREADS"
+               CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024"
                libdl=
                libgc_threads=win32
                gc_default=included
@@ -1035,6 +1035,41 @@ if test x$platform_win32 = xno; then
                AC_MSG_RESULT(no)
        ]) 
 
+       dnl *********************
+       dnl *** Check for AIO ***
+       dnl *********************
+       AC_MSG_CHECKING([for SIGEV_THREAD definition])
+       dnl Some systems (FreeBSD at least) may have aio_read
+       dnl but don't support/define SIGEV_THREAD.
+       AC_TRY_COMPILE([
+       #include <sys/signal.h>
+       ],[
+       int x = SIGEV_THREAD;
+       ],[
+               ac_cv_c_sigev_thread=yes
+               AC_MSG_RESULT(yes)
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+
+       if test "$ac_cv_c_sigev_thread" = "yes" ; then
+               AC_CHECK_HEADERS(aio.h sys/aio.h)
+               AC_CHECK_LIB(rt, aio_read, [ LIBS="$LIBS -lrt" ],)
+               SIGVAL_PTR="undefined"
+               if test "$ac_cv_header_aio_h" = "yes" -o "$ac_cv_header_sys_aio_h" = "yes" ; then
+                       AC_CHECK_MEMBER(union sigval.sigval_ptr,SIGVAL_PTR="sigval_ptr",, [
+                                       #include <sys/signal.h>
+                                       ])
+                       AC_CHECK_MEMBER(union sigval.sival_ptr,SIGVAL_PTR="sival_ptr",, [
+                                       #include <sys/signal.h>
+                                       ])
+                       if test "$SIGVAL_PTR" = "undefined" ; then
+                               AC_MSG_ERROR([Unable to detect field name in 'union sigval'])
+                       fi
+               fi
+               AC_DEFINE_UNQUOTED(SIGVAL_PTR,$SIGVAL_PTR,[Pointer field name in 'union sigval'])
+       fi
+
        dnl **********************************
        dnl *** Checks for MonoPosixHelper ***
        dnl **********************************