Flush

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 5c5a5f248ba35c5b6e881d0200ba2d5c7c979dc8..4722d125a3b06a02972677aea1f0a45a1c792e21 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.91.99)
+AM_INIT_AUTOMAKE(mono,0.95)
 AM_MAINTAINER_MODE
 
 dnl
@@ -42,12 +42,17 @@ case "$host" in
                AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32])
                CC="gcc -mno-cygwin"
                HOST_CC="gcc"
+               # So libgc configure gets -mno-cygwin
+               export CC
 # latest libgc already defines GC_WIN32_THREADS
 #              CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS -DWIN32_THREADS"
                CPPFLAGS="$CPPFLAGS -DWIN32_THREADS"
                libdl=
                libgc_threads=win32
                gc_default=boehm 
+               with_nptl=no
+               with_sigaltstack=no
+
                ;;
        *-*-*netbsd*)
                platform_win32=no
@@ -106,8 +111,7 @@ case "$host" in
                AC_DEFINE(USE_MACH_SEMA)
                no_version_script=yes
                libdl=
-               libgc_threads=no
-               gc_default=none 
+               libgc_threads=pthreads
                ;;
        *)
                AC_MSG_WARN([*** Please add $host to configure.in checks!])
@@ -897,6 +901,7 @@ if test x$platform_win32 = xno; then
                AC_DEFINE_UNQUOTED(SIGVAL_PTR,$SIGVAL_PTR,[Pointer field name in 'union sigval'])
        fi
 else
+       jdk_headers_found=no
        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?))
 fi
@@ -916,13 +921,13 @@ ac_cv_c_socklen_t=yes
        AC_MSG_RESULT(no)
 ])
 
-AC_CHECK_FUNCS(truncl, , AC_MSG_CHECKING(for truncl in math.h)
+AC_CHECK_FUNCS(trunc, , AC_MSG_CHECKING(for trunc in math.h)
        AC_TRY_LINK([#include <math.h>], 
-       [ truncl(0.0); ], 
+       [ trunc(0.0); ], 
        [
-               AC_DEFINE(HAVE_TRUNCL) 
+               AC_DEFINE(HAVE_TRUNC) 
                AC_MSG_RESULT(yes)
-               ac_cv_truncl=yes
+               ac_cv_trunc=yes
        ],
        AC_MSG_RESULT(no)))
 
@@ -948,7 +953,7 @@ case "{$target}" in
 dnl Win32 does not have /dev/random, they have their own method...
 
     *-*-mingw*|*-*-cygwin*)
-    ac_cv_have_dev_random = no
+    ac_cv_have_dev_random=no
     ;;
 
 dnl Everywhere else, it's /dev/random
@@ -1133,6 +1138,9 @@ case "$host" in
        libsuffix=".dylib"
        LIBC="libc.dylib"
        ;;
+     *-*-*netbsd*)
+       LIBC="libc.so.12"
+       ;;
 esac
 AC_SUBST(libsuffix)
 
@@ -1239,6 +1247,8 @@ samples/Makefile
 support/Makefile
 data/config
 mono.spec
+tools/Makefile
+tools/locale-builder/Makefile
 ])
 
 echo "