2008-11-20 Gonzalo Paniagua Javier <gonzalo@novell.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 42a9116ce900834746d530cf2854992505d64551..1d7cd8bbf0d7207826e33c06277c9b958243e371 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
 m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,2.1)
+AM_INIT_AUTOMAKE(mono,2.3)
 AM_MAINTAINER_MODE
 
 API_VER=1.0
@@ -265,6 +265,7 @@ 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 sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h)
+AC_CHECK_HEADERS(sys/user.h sys/ipc.h sys/sem.h alloca.h ucontext.h)
 
 AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
 if test x$have_zlib = xyes; then
@@ -1267,6 +1268,9 @@ if test x$platform_win32 = xno; then
        # pthread (first!) on Linux
        AC_SEARCH_LIBS(sem_init, pthread rt posix4) 
 
+       AC_SEARCH_LIBS(shm_open, pthread rt posix4) 
+       AC_CHECK_FUNCS(shm_open)
+
        dnl ********************************
        dnl *** Checks for timezone stuff **
        dnl ********************************
@@ -1436,12 +1440,17 @@ if test x$platform_win32 = xno; then
                 #include <unistd.h>])
        AC_CHECK_TYPES([suseconds_t], [AC_DEFINE(HAVE_SUSECONDS_T)], ,
                [#include <sys/time.h>])
+       AC_CHECK_TYPES([struct flock], [AC_DEFINE(HAVE_STRUCT_FLOCK)], ,
+               [#include <unistd.h>
+                #include <fcntl.h>])
        AC_CHECK_TYPES([struct pollfd], [AC_DEFINE(HAVE_STRUCT_POLLFD)], ,
                [#include <sys/poll.h>])
        AC_CHECK_TYPES([struct stat], [AC_DEFINE(HAVE_STRUCT_STAT)], ,
                [#include <sys/types.h>
                 #include <sys/stat.h>
                 #include <unistd.h>])
+       AC_CHECK_TYPES([struct timespec], [AC_DEFINE(HAVE_STRUCT_TIMESPEC)], ,
+               [#include <time.h>])
        AC_CHECK_TYPES([struct timeval], [AC_DEFINE(HAVE_STRUCT_TIMEVAL)], ,
                [#include <sys/time.h>
                 #include <sys/types.h>
@@ -1462,11 +1471,20 @@ if test x$platform_win32 = xno; then
        )
        AC_SUBST(XATTR_LIB)
 
+       dnl kinfo_proc.kp_proc works on darwin but fails on other simil-bsds
+       AC_CHECK_MEMBERS(
+               [struct kinfo_proc.kp_proc],,, 
+               [#include <sys/types.h>
+                #include <sys/sysctl.h>
+                #include <sys/proc.h>
+                ])
+
        dnl *********************************
        dnl *** Checks for Windows compilation ***
        dnl *********************************
        AC_CHECK_HEADERS(sys/time.h)
        AC_CHECK_HEADERS(sys/param.h)
+       AC_CHECK_HEADERS(dirent.h)
 
        dnl *********************************
        dnl *** Check for Console 2.0 I/O ***
@@ -1847,8 +1865,10 @@ case "$host" in
         powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* )
                if test "x$ac_cv_sizeof_void_p" = "x8"; then
                        TARGET=POWERPC64;
+                       CPPFLAGS="$CPPFLAGS -D__mono_ppc__ -D__mono_ppc64__"
                else
                        TARGET=POWERPC;
+                       CPPFLAGS="$CPPFLAGS -D__mono_ppc__"
                fi
                AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters])
                arch_target=ppc;
@@ -2281,7 +2301,6 @@ mono/tests/cas/inheritance/Makefile
 mono/tests/cas/linkdemand/Makefile
 mono/tests/cas/threads/Makefile
 mono/benchmark/Makefile
-mono/monoburg/Makefile
 mono/monograph/Makefile
 mono/io-layer/Makefile
 mono/mini/Makefile
@@ -2299,6 +2318,9 @@ data/mint.pc
 data/mono.pc
 data/mono-cairo.pc
 data/mono-nunit.pc
+data/mono-options.pc
+data/mono-lineeditor.pc
+data/monodoc.pc
 data/dotnet.pc
 data/dotnet35.pc
 data/wcf.pc
@@ -2366,6 +2388,10 @@ fi
     echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make
   fi
 
+  if test x$TARGET = xAMD64 -a x$platform_win32 = xno; then
+        echo "ENABLE_AOT = 1" >> $srcdir/$mcsdir/build/config.make
+  fi
+
   # if we have an olive folder, override the default settings
   if test -d $olivedir; then
 
@@ -2407,7 +2433,7 @@ echo "
 
 "
 if test x$with_static_mono = xno -a "x$platform_win32" != "xyes"; then
-   AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexepcted bugs)
+   AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexpected bugs)
 fi
 
 if test x$gc = xsgen; then