Sat Jul 13 15:08:12 CEST 2002 Paolo Molaro <lupus@ximian.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 52b98875a9205a0aebed0770a7eb3a4de3697c42..1f1dc59c2acb452b7419a0281cea0c4d806b1c6c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono, 0.11)
+AM_INIT_AUTOMAKE(mono, 0.12)
 AM_MAINTAINER_MODE
 
 dnl ****************************************
@@ -138,7 +138,7 @@ if test x$platform_win32 = xno; then
        
        # Check that off_t can represent 2**63 - 1 correctly, working around
        # potential compiler bugs.  Defines LARGE_FILE_SUPPORT, adds $1 to
-       # CFLAGS and sets $large_offt to yes if the test succeeds
+       # CPPFLAGS and sets $large_offt to yes if the test succeeds
        large_offt=no
        AC_DEFUN(LARGE_FILES, [
                large_CPPFLAGS=$CPPFLAGS
@@ -160,7 +160,7 @@ if test x$platform_win32 = xno; then
                ], [
                        AC_MSG_RESULT(ok)
                        AC_DEFINE(HAVE_LARGE_FILE_SUPPORT)
-                       CFLAGS="$CFLAGS $1"
+                       large_CPPFLAGS="$large_CPPFLAGS $1"
                        large_offt=yes
                ], [
                        AC_MSG_RESULT(no)
@@ -183,6 +183,21 @@ if test x$platform_win32 = xno; then
        dnl *****************************
        AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
 
+       dnl *******************************
+       dnl *** Checks for MSG_NOSIGNAL ***
+       dnl *******************************
+       AC_MSG_CHECKING(for MSG_NOSIGNAL)
+       AC_TRY_COMPILE([#include <sys/socket.h>], [
+               int f = MSG_NOSIGNAL;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_MSG_NOSIGNAL)
+       ], [
+               # We'll have to use signals
+               AC_MSG_RESULT(no)
+       ])
+
        dnl *****************************
        dnl *** Checks for SOL_IP     ***
        dnl *****************************
@@ -250,10 +265,33 @@ if test x$platform_win32 = xno; then
 
        AC_CHECK_FUNCS(inet_pton inet_aton)
 
+       dnl ***********************************************
+       dnl *** Checks for size of sockaddr_un.sun_path ***
+       dnl ***********************************************
+       # AC_CHECK_SIZEOF can't cope with struct members :-(
+       AC_MSG_CHECKING(size of sockaddr_un.sun_path)
+       AC_CACHE_VAL(cv_mono_sizeof_sunpath,
+               [AC_TRY_RUN([
+                       #include <stdio.h>
+                       #include <sys/un.h>
+
+                       int main(void) {
+                               struct sockaddr_un sock_un;
+                               FILE *f=fopen("conftestval", "w");
+                               if(!f) exit(1);
+                               fprintf(f, "%d\n", sizeof(sock_un.sun_path));
+                               exit(0);
+                       }
+               ], cv_mono_sizeof_sunpath=`cat conftestval`,
+                  cv_mono_sizeof_sunpath=0,
+                  cv_mono_sizeof_sunpath=0)])dnl
+       AC_MSG_RESULT($cv_mono_sizeof_sunpath)
+       AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $cv_mono_sizeof_sunpath)
+
        dnl *****************************
        dnl *** Checks for libpthread ***
        dnl *****************************
-       AC_SEARCH_LIBS(pthread_create, pthread, [
+       AC_SEARCH_LIBS(pthread_create, pthread c_r, [
                AM_CONDITIONAL(THREADS_PTHREAD, true)
                AC_DEFINE(HAVE_PTHREAD)
 
@@ -292,7 +330,7 @@ if test x$platform_win32 = xno; then
                        ])
                ])
                CPPFLAGS=$orig_CPPFLAGS
-               CFLAGS="$CFLAGS $pthread_CFLAGS"
+               CPPFLAGS="$CPPFLAGS $pthread_CFLAGS"
 
                # Need PTHREAD_MUTEX_RECURSIVE
                pthread_CFLAGS=""
@@ -328,7 +366,7 @@ if test x$platform_win32 = xno; then
                        ])
                ])
                CPPFLAGS=$orig_CPPFLAGS
-               CFLAGS="$CFLAGS $pthread_CFLAGS"
+               CPPFLAGS="$CPPFLAGS $pthread_CFLAGS"
        ], [
                AC_MSG_ERROR([libpthread is required on non-win32 hosts])
        ])
@@ -508,6 +546,9 @@ mono/metadata/Makefile
 mono/dis/Makefile
 mono/cil/Makefile
 mono/arch/Makefile
+mono/os/Makefile
+mono/os/win32/Makefile
+mono/os/unix/Makefile
 mono/arch/x86/Makefile
 mono/arch/ppc/Makefile
 mono/arch/sparc/Makefile