Merge pull request #2868 from akoeplinger/maccore-fixes

[mono.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5957367b5a31180e8c8cf085793b006ca8db30e6..66174bea4e6ca48e97e79b77831ac17db5ad92b2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -929,10 +929,8 @@ if test x$has_extension_module != xno ; then
        AC_MSG_NOTICE([Enabling mono extension module.])
 fi
 
-AC_ARG_ENABLE(gsharedvt, [  --enable-gsharedvt Enable generic valuetype sharing], enable_gsharedvt=$enableval, enable_gsharedvt=no)
-if test x$enable_gsharedvt = xyes; then
-       AC_DEFINE(ENABLE_GSHAREDVT,1,[Gsharedvt])
-fi
+# Deprecated
+AC_ARG_ENABLE(gsharedvt, [  --enable-gsharedvt Enable generic valuetype sharing (Deprecated)], enable_gsharedvt=$enableval, enable_gsharedvt=no)
 
 AC_MSG_CHECKING(for visibility __attribute__)
 AC_COMPILE_IFELSE([
@@ -1078,6 +1076,7 @@ if test x$host_win32 = xno; then
 
        dnl hires monotonic clock support
        AC_SEARCH_LIBS(clock_gettime, rt)
+       AC_CHECK_FUNCS(clock_nanosleep)
 
        dnl dynamic loader support
        AC_CHECK_FUNC(dlopen, DL_LIB="",
@@ -2319,6 +2318,9 @@ else
                #include <winsock2.h>
                #include <ws2tcpip.h>
        ], [
+               #ifndef inet_pton
+               (void) inet_pton;
+               #endif
                inet_pton (0, NULL, NULL);
        ], [
                # Yes, we have it...
@@ -4064,10 +4066,6 @@ fi
     if test x$has_extension_module != xno; then
         echo "EXTENSION_MODULE = 1" >> $srcdir/$mcsdir/build/config.make
     fi
-
-    if test x$enable_gsharedvt = xno; then
-        echo "MONO_DISABLE_GSHAREDVT = 1" >> $srcdir/$mcsdir/build/config.make
-    fi
     
     echo "DEFAULT_PROFILE = $default_profile" >> $srcdir/$mcsdir/build/config.make