Make a method private for 1.x

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 5ff1fc49f08e7a98d7a029bcbeeeea8b92468128..da885aacd9b4c06358f947ec1b94de56b9ed66bc 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,1.1.17)
+AM_INIT_AUTOMAKE(mono,1.2)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -72,7 +72,6 @@ case "$host" in
                libdl=
                libgc_threads=win32
                gc_default=included
-               with_nptl=default
                with_sigaltstack=no
                LN_S=cp
                # This forces libgc to use the DllMain based thread registration code on win32
@@ -113,7 +112,6 @@ case "$host" in
                libdl=
                libgc_threads=pthreads
 # TLS isn't implemented at all on 4-STABLE
-               with_nptl=no
                with_tls=pthread
                ;;
        *-*-*freebsd5*)
@@ -206,7 +204,7 @@ case "$host" in
                libmono_cflags="-D_REENTRANT"
                libgc_threads=pthreads
                # This doesn't seem to work on solaris/x86, but the configure test runs
-               with_nptl=no
+               with_tls=pthread
                ;;
        *-*-darwin*)
                platform_win32=no
@@ -370,7 +368,7 @@ mcs_topdir='$(top_srcdir)/'$mcsdir
 mcs_topdir_from_srcdir='$(top_builddir)/'$mcsdir
 
 ## Maybe should also disable if mcsdir is invalid.  Let's punt the issue for now.
-AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno])
+AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_build != xno])
 
 AC_SUBST([mcs_topdir])
 AC_SUBST([mcs_topdir_from_srcdir])
@@ -470,20 +468,6 @@ AC_ARG_WITH(gc, [  --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default]
 # Some systems have broken support, so we allow to disable it.
 AC_ARG_WITH(tls, [  --with-tls=__thread,pthread       select Thread Local Storage implementation],[],[with_tls=__thread])
 
-# Kept for compatibility
-AC_ARG_WITH(nptl, [  --with-nptl=yes,no      deprecated, use --with-tls instead],[],[with_nptl=default])
-
-if test "x$with_nptl" != "xdefault"; then
-   if test "x$with_nptl" = "xyes"; then
-      AC_MSG_WARN([--with-nptl=yes is deprecated, use --with-tls=__thread option instead.])
-         with_tls=__thread
-   fi
-   if test "x$with_nptl" = "xno"; then
-      AC_MSG_WARN([--with-nptl=no is deprecated, use --with-tls=pthread option instead.])
-         with_tls=pthread
-   fi
-fi
-
 # Enable support for using sigaltstack for SIGSEGV and stack overflow handling
 # This does not work on some platforms (bug #55253)
 AC_ARG_WITH(sigaltstack, [  --with-sigaltstack=yes,no      enable/disable support for sigaltstack],[],[with_sigaltstack=no])
@@ -500,6 +484,7 @@ if test "x$platform_win32" = "xyes"; then
 fi
 
 AM_CONDITIONAL(STATIC_MONO, test x$with_static_mono != xno)
+AC_ARG_ENABLE(mcs-build, [  --disable-mcs-build disable the build of the mcs directory], try_mcs_build=$enableval, enable_mcs_build=yes)
 
 AC_ARG_WITH(xen_opt,   [  --with-xen_opt=yes,no      Enable Xen-specific behaviour],[],[with_xen_opt=yes])
 if test "x$with_xen_opt" = "xyes"; then
@@ -1289,6 +1274,28 @@ if test x$platform_win32 = xno; then
        AC_CHECK_FUNCS(strerror_r)
        AC_CHECK_FUNCS(ttyname_r)
        AC_CHECK_SIZEOF(size_t)
+       AC_CHECK_TYPES([blksize_t], [AC_DEFINE(HAVE_BLKSIZE_T)], , 
+               [#include <sys/types.h>
+                #include <sys/stat.h>
+                #include <unistd.h>])
+       AC_CHECK_TYPES([blkcnt_t], [AC_DEFINE(HAVE_BLKCNT_T)], ,
+               [#include <sys/types.h>
+                #include <sys/stat.h>
+                #include <unistd.h>])
+       AC_CHECK_TYPES([suseconds_t], [AC_DEFINE(HAVE_SUSECONDS_T)], ,
+               [#include <sys/time.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 timeval], [AC_DEFINE(HAVE_STRUCT_TIMEVAL)], ,
+               [#include <sys/time.h>
+                #include <sys/types.h>
+                #include <utime.h>])
+       AC_CHECK_TYPES([struct timezone], [AC_DEFINE(HAVE_STRUCT_TIMEZONE)], ,
+               [#include <sys/time.h>])
        AC_CHECK_MEMBERS(
                [struct dirent.d_off, struct dirent.d_reclen, struct dirent.d_type],,, 
                [#include <sys/types.h>
@@ -1488,6 +1495,13 @@ case "$host" in
 #              TARGET=MIPS;
 #              ACCESS_UNALIGNED="no"
 #              ;;
+       mips*)
+               TARGET=MIPS;
+               arch_target=mips;
+               ACCESS_UNALIGNED="no"
+               JIT_SUPPORTED=yes
+               jit_wanted=true
+               ;;
        i*86-*-*)
                TARGET=X86;
                arch_target=x86;
@@ -1569,6 +1583,8 @@ case "$host" in
                esac
               ;;
        *-*-mingw*|*-*-cygwin*)
+               # When this is enabled, it leads to very strange crashes at runtime (gcc-3.4.4)
+               have_visibility_hidden=no
                INTL="intl"
                ;;
        hppa2.0w-hp-hpux11.00 | hppa64-hp-hpux11.00)
@@ -1779,7 +1795,7 @@ if test ${TARGET} = ARM; then
                ])
 
        AC_MSG_RESULT($fpu)
-       CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu"
+       CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
        unset fpu
 fi
 
@@ -1810,6 +1826,7 @@ AM_CONDITIONAL(AMD64, test x$TARGET = xAMD64)
 AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA)
 AM_CONDITIONAL(IA64, test x$TARGET = xIA64)
 AM_CONDITIONAL(M68K, test x$TARGET = xM68K)
+AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
 AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
 AM_CONDITIONAL(ARM, test x$TARGET = xARM)
 AM_CONDITIONAL(S390, test x$TARGET = xS390)
@@ -1922,6 +1939,7 @@ mono/arch/s390x/Makefile
 mono/arch/arm/Makefile
 mono/arch/alpha/Makefile
 mono/arch/ia64/Makefile
+mono/arch/mips/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile
 mono/tests/tests-config
@@ -1977,7 +1995,7 @@ fi
   # any existing config.make.  This allows people to share the same source tree
   # with different build directories, one native and one cross
   #
-  if test x$cross_compiling = xno; then
+  if test x$cross_compiling = xno && test x$enable_mcs_build != xno; then
     echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
     echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
     echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make