X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=7ed7331e125ffca039421c5a1f87d32b900319ab;hb=83569e1ef07325ec30b00d3e2b955718f210e608;hp=a34e013ee65dad4f601366ae9728b80beb83193a;hpb=cb11326fc13eb84542558749bfdcf31817190c20;p=mono.git

diff --git a/configure.in b/configure.in
index a34e013ee65..7ed7331e125 100644
--- a/configure.in
+++ b/configure.in
@@ -406,6 +406,17 @@ AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_bui
 AC_SUBST([mcs_topdir])
 AC_SUBST([mcs_topdir_from_srcdir])
 
+# Where's the 'olive' source tree?
+if test -d $srcdir/olive; then
+  olivedir=olive
+else
+  olivedir=../olive
+fi
+
+if test -d $olivedir; then
+olive_topdir='$(top_srcdir)/'$olivedir
+fi
+
 AC_ARG_WITH([libgdiplus], 
 	[  --with-libgdiplus=installed|sibling|<path>	Override the libgdiplus used for System.Drawing tests (defaults to NO)], 
 	[], [with_libgdiplus=installed])
@@ -774,6 +785,8 @@ if test x$platform_win32 = xno; then
 	AC_CHECK_FUNCS(mmap)
 	AC_CHECK_FUNCS(madvise)
 	AC_CHECK_FUNCS(getrusage)
+	AC_CHECK_FUNCS(getpriority)
+	AC_CHECK_FUNCS(setpriority)
 
 	AC_CHECK_FUNCS(sched_setaffinity)
 
@@ -1438,6 +1451,7 @@ else
 	AC_CHECK_LIB(ole32, main, LIBS="$LIBS -lole32", AC_ERROR(bad mingw install?))
 	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?))
 
 	dnl *********************************
 	dnl *** Check for struct ip_mreqn ***
@@ -1716,8 +1730,8 @@ case "$host" in
 		JIT_SUPPORTED=yes
 		jit_wanted=true
 		;;
-	macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | \
-        powerpc-*-sysv* | powerpc-*-darwin*)
+	macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \
+        powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* )
 		TARGET=POWERPC;
 		AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters])
 		arch_target=ppc;
@@ -1902,11 +1916,7 @@ if test ${TARGET} = ARM; then
 
 	AC_TRY_COMPILE([], [
 		__asm__ ("ldfd f0, [r0]");
-		], fpu=FPA, [
-			AC_TRY_COMPILE([], [
-				__asm__ ("fldd d0, [r0]");
-			], fpu=VFP, fpu=NONE)
-		])
+		], fpu=FPA, fpu=NONE)
 
 	AC_MSG_RESULT($fpu)
 	CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
@@ -2077,6 +2087,7 @@ mono/arch/mips/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile
 mono/tests/tests-config
+mono/tests/assemblyresolve/Makefile
 mono/tests/cas/Makefile
 mono/tests/cas/assembly/Makefile
 mono/tests/cas/demand/Makefile
@@ -2154,17 +2165,40 @@ fi
     export VERSION
     [myver=$($AWK 'BEGIN {
       split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".")
+      if(length(vsplit [1]) > 4) {
+        split (substr(ENVIRON["VERSION"], 0, 4) "." substr(ENVIRON["VERSION"], 5) ".0.0", vsplit, ".")
+      }
       print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4]
     }')]
 
     echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make
   fi
+
+  # if we have an olive folder, override the default settings
+  if test -d $olivedir; then
+
+    test -w $srcdir/$olivedir/build || chmod +w $srcdir/$olivedir/build
+
+    if test x$cross_compiling = xno && test x$enable_olive_build != xno; then
+      echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
+      echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
+      echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
+      echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
+      echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
+      echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
+	  if test x$with_moonlight = xyes; then
+        echo "WITH_MOONLIGHT = yes" >> $srcdir/$olivedir/build/config.make
+      fi
+    fi
+  fi
 )
 
 libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}
 
 echo "
-        mcs source:  $mcs_topdir
+        mcs source:    $mcs_topdir
+        olive source:  $olive_topdir
+
 	GC:	     $gc
 	TLS:         $with_tls
 	SIGALTSTACK: $with_sigaltstack