X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=12626cccf579888022e084726f165f2f4b94f4a9;hb=6a329d951df135123647116d34b97e2e9e1d7f19;hp=945ebf7adc45d90d88dfcd8e4c453747605f28bc;hpb=b44cc09572330cd892614f193cc728bec9700283;p=mono.git

diff --git a/configure.in b/configure.in
index 945ebf7adc4..12626cccf57 100644
--- a/configure.in
+++ b/configure.in
@@ -327,7 +327,7 @@ if test x$platform_win32 = xno; then
 	dnl *** Checks for the IKVM JNI interface library                  ***
 	dnl ******************************************************************
 	AC_ARG_WITH(ikvm-jni, [  --with-ikvm-jni=yes,no  build the IKVM JNI interface library],[with_ikvm_jni=$withval],[with_ikvm_jni=yes])
-	AC_ARG_WITH(jdk, [  --with-jdk=DIRECTORY  use JDK from DIRECTORY],[with_jdk_dir=$withval],[with_jdk_dir=])
+	AC_ARG_WITH(jdk, [  --with-jdk=DIRECTORY    Use JDK from DIRECTORY],[with_jdk_dir=$withval],[with_jdk_dir=])
 
 	ikvm_jni_dir=
 	if test x$with_ikvm_jni = xyes; then
@@ -852,8 +852,21 @@ if test x$platform_win32 = xno; then
 	dnl *********************
 	dnl *** Check for AIO ***
 	dnl *********************
-	AC_CHECK_HEADERS(aio.h)
+	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'])
 else
 	AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))
 	AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?))
@@ -949,7 +962,8 @@ if test "x$ac_cv_have_dev_random" = "xno" \
 *** entropy collection in place, please contact <crichton@gimp.org> and
 *** provide information about the system and how to access the random device.
 ***
-*** For those systems who lack a random device, EGD support is forthcoming.
+*** Otherwise you can install either egd or prngd and set the environment
+*** variable MONO_EGD_SOCKET to point to the daemon's socket to use that.
 ***]])
 fi
  
@@ -1048,7 +1062,7 @@ case "$host" in
 		;;
 esac
 
-AC_ARG_WITH(jit, [  --with-jit=yes,no    If you want to build scripts that default to the JIT],[
+AC_ARG_WITH(jit, [  --with-jit=yes,no       If you want to build scripts that default to the JIT],[
 	jit_wanted=true
 ])
 
@@ -1158,6 +1172,8 @@ mono/mini/Makefile
 mono/profiler/Makefile
 ikvm-jni/Makefile
 runtime/Makefile
+runtime/net_1_1/Makefile
+runtime/net_2_0/Makefile
 scripts/Makefile
 man/Makefile
 web/Makefile