Reuse 2.0 test harness

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 18b54e322e97b0fca6dc1ae8613bbf504b6596eb..2de9c2bbe27c80c32238d33c47f94d5799970657 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1484,6 +1484,7 @@ else
        AC_CHECK_LIB(winmm, main, LIBS="$LIBS -lwinmm", AC_ERROR(bad mingw install?))
        AC_CHECK_LIB(oleaut32, main, LIBS="$LIBS -loleaut32", AC_ERROR(bad mingw install?))
        AC_CHECK_LIB(advapi32, main, LIBS="$LIBS -ladvapi32", AC_ERROR(bad mingw install?))
+       AC_CHECK_LIB(version, main, LIBS="$LIBS -lversion", AC_ERROR(bad mingw install?))
 
        dnl *********************************
        dnl *** Check for struct ip_mreqn ***
@@ -1631,17 +1632,6 @@ if test "x$try_shared_handles" != "xyes"; then
        AC_SUBST(DISABLE_SHARED_HANDLES)
 fi
 
-# Check for glib functions that we can do without if they aren't present.
-# This means we don't have to make the required version too new for some
-# prehistoric distros we still have to build on.
-OLD_LIBS="$LIBS"
-LIBS="$LIBS $GLIB_LIBS"
-OLD_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS"
-AC_CHECK_FUNCS(g_strsplit_set)
-AC_CHECK_FUNCS(g_strv_length)
-LIBS="$OLD_LIBS"
-CPPFLAGS="$OLD_CPPFLAGS"
 
 AC_ARG_ENABLE(nunit-tests, [ --enable-nunit-tests      Run the nunit tests of the class library on 'make check'])
 AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes])
@@ -1983,10 +1973,10 @@ AC_ARG_WITH(preview,  [ --with-preview=yes,no     If you want to install the 2.0
        fi
 ])
 
-MOONLIGHT=no
+MOONLIGHT=yes
 AC_ARG_WITH(moonlight,[ --with-moonlight=yes,no   If you want to build the Moonlight 2.1 assemblies],[
-       if test x$with_moonlight = xyes; then
-             MOONLIGHT=yes
+       if test x$with_moonlight = xno; then
+             MOONLIGHT=no
        fi
 ])