Errors -> Warnings

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index e9a1d8a3c83bc0e965d110a01255de9af93c4b02..03c8958faa6972d769a4bd2938345bcd3682f10c 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.9)
+AM_INIT_AUTOMAKE(mono,2.0)
 AM_MAINTAINER_MODE
 
 API_VER=1.0
@@ -300,7 +300,6 @@ AC_LIBTOOL_WIN32_DLL
 # This causes monodis to not link correctly
 #AC_DISABLE_FAST_INSTALL
 AM_PROG_LIBTOOL
- 
 # Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.
 DOLT
 
@@ -581,6 +580,8 @@ if test "x$with_xen_opt" = "xyes"; then
        ])
 fi
 
+AC_ARG_ENABLE(quiet-build, [  --enable-quiet-build  Enable quiet runtime build], enable_quiet_build=$enableval, enable_quiet_build=yes)
+
 DISABLED_FEATURES=none
 
 AC_ARG_ENABLE(minimal, [  --enable-minimal=LIST      drop support for LIST subsystems.
@@ -1040,7 +1041,7 @@ if test x$platform_win32 = xno; then
        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_CACHE_VAL(mono_cv_sizeof_sunpath,
                [AC_TRY_RUN([
                        #include <sys/types.h>
                        #include <stdio.h>
@@ -1053,11 +1054,11 @@ if test x$platform_win32 = xno; then
                                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, [Sizeof sock_un.sun_path])
+               ], mono_cv_sizeof_sunpath=`cat conftestval`,
+                  mono_cv_sizeof_sunpath=0,
+                  mono_cv_sizeof_sunpath=0)])dnl
+       AC_MSG_RESULT($mono_cv_sizeof_sunpath)
+       AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $mono_cv_sizeof_sunpath, [Sizeof sock_un.sun_path])
 
        dnl *************************************
        dnl *** Checks for zero length arrays ***
@@ -2062,6 +2063,11 @@ if test ${ACCESS_UNALIGNED} = no; then
        CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
 fi
 
+AC_ARG_ENABLE(parallel-mark, [  --enable-parallel-mark     Enables GC Parallel Marking])
+if test x$enable_parallel_mark = xyes; then
+       libgc_configure_args="$libgc_configure_args --enable-parallel-mark"
+fi
+
 case "x$gc" in
        xincluded)
                # Pass CPPFLAGS to libgc configure
@@ -2236,6 +2242,10 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser],
     cd $depth
 ],[LN_S='$LN_S'])
 
+if test x$enable_quiet_build = xyes; then
+   AC_CONFIG_COMMANDS([quiet], [find mono libgc support -name Makefile -exec $shell $srcdir/scripts/patch-quiet.sh {} \;], [shell=$SHELL])
+fi
+
 AC_OUTPUT([
 Makefile
 mono-uninstalled.pc