Add 2.0 version attributes

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index caf15b82ea3858b7ac5dd8b9c41ae838777f8e4a..12626cccf579888022e084726f165f2f4b94f4a9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -115,8 +115,6 @@ esac
 AC_MSG_RESULT(ok)
 AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
 
-AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
-
 AC_CHECK_TOOL(CC, gcc, gcc)
 AC_PROG_CC
 AM_PROG_CC_STDC
@@ -159,6 +157,8 @@ if test "x$lt_cv_prog_gnu_ld" = "xno"; then
    no_version_script=yes
 fi
 
+AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
+
 AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h sys/un.h)
 
 # for mono/mini/tramp-x86.c
@@ -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