* Monitor.cs: Fix spelleng.

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index b5751616a97e2b070f77de3046aefb99b42bdfd6..44f1a4669ab2460eaa0270832f3cf6b403e3ffcd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,0.29.99)
+AM_INIT_AUTOMAKE(mono,0.30.99)
 AM_MAINTAINER_MODE
 
 dnl
@@ -27,6 +27,9 @@ libmono_ldflags=""
 AC_SUBST(libmono_cflags)
 AC_SUBST(libmono_ldflags)
 
+dnl if linker handles the version script
+no_version_script=no
+
 # Thread configuration inspired by sleepycat's db
 AC_MSG_CHECKING([host platform characteristics])
 libgc_threads=no
@@ -98,6 +101,7 @@ case "$host" in
                AC_DEFINE(NEED_LINK_UNLINK)
                AC_DEFINE(PTHREAD_POINTER_ID)
                AC_DEFINE(USE_MACH_SEMA)
+               no_version_script=yes
                libdl=
                libgc_threads=no
                gc_default=none 
@@ -110,6 +114,7 @@ case "$host" in
 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
@@ -221,7 +226,7 @@ AC_ARG_WITH(gc, [  --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default]
 # Enable support for NPTL only features like fast thread-local storage
 # We can't reliably detect nptl at compile & run time
 # so this option will stay until nptl becomes more widespread
-AC_ARG_WITH(nptl, [  --with-nptl Enable support for NPTL])
+AC_ARG_WITH(nptl, [  --with-nptl=yes,no      enable/disable support for NPTL],[],[with_nptl=yes])
 
 # assembly bundle support, see metadata/make-bundle.pl for more info
 AC_ARG_WITH(bundle, [  --with-bundle=bundle_template],[
@@ -464,6 +469,8 @@ if test x$platform_win32 = xno; then
                # Yes, we have it...
                AC_MSG_RESULT(yes)
                AC_DEFINE(HAVE_GETHOSTBYNAME2_R)
+       ], [
+               AC_MSG_RESULT(no)
        ])
 
        dnl *****************************
@@ -589,7 +596,7 @@ if test x$platform_win32 = xno; then
                        return !(res1 + res2 == 2);
                }
        ], [
-                       if test "x$with_nptl" = "x"; then
+                       if test "x$with_nptl" != "xyes"; then
                                AC_MSG_RESULT(disabled)
                        else
                                AC_MSG_RESULT(yes)
@@ -671,6 +678,27 @@ else
        AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?))
 fi
 
+dnl socklen_t check
+AC_MSG_CHECKING(for socklen_t)
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+],[
+  socklen_t foo;
+],[
+ac_cv_c_socklen_t=yes
+       AC_DEFINE(HAVE_SOCKLEN_T)
+       AC_MSG_RESULT(yes)
+],[
+       AC_MSG_RESULT(no)
+])
+
+AC_CHECK_FUNCS(truncl, , AC_MSG_CHECKING(for truncl in math.h)
+       AC_TRY_LINK([#include <math.h>], 
+       [ truncl(0.0); ], 
+       AC_DEFINE(HAVE_TRUNCL) AC_MSG_RESULT(yes),
+       AC_MSG_RESULT(no)))
+
 dnl ****************************
 dnl *** Look for /dev/random ***
 dnl ****************************
@@ -872,6 +900,7 @@ AC_SUBST(LDFLAGS)
 
 AC_OUTPUT([
 Makefile
+mint.pc
 mono.pc
 mono/Makefile
 mono/utils/Makefile