X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=a22871ebb64531a44c98f12fe4bbe10733df5bdf;hb=df47a233bb1aaaf5707291cf7c5b83e066ab9f72;hp=9ea215174668015a914c4cf2372c58bea1594942;hpb=3b549d9810bf868241c02218277995a9039e9a68;p=mono.git

diff --git a/configure.in b/configure.in
index 9ea21517466..a22871ebb64 100644
--- a/configure.in
+++ b/configure.in
@@ -95,7 +95,7 @@ case "$host" in
 		host_win32=yes
 		if test "x$cross_compiling" = "xno"; then
 			target_win32=yes
-			if test "x$host" == "x$build"; then
+			if test "x$host" == "x$build" -a "x$host" == "x$target"; then
 				AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32])
 			fi
 			#
@@ -576,9 +576,6 @@ if test x$cross_compiling$host_win32 = xnoyes; then
   esac
 fi
 
-## Maybe should also disable if mcsdir is invalid.  Let's punt the issue for now.
-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])
 
@@ -2176,6 +2173,7 @@ case "$host" in
 	mips*)
 		TARGET=MIPS;
 		arch_target=mips;
+		sgen_supported=true
 		ACCESS_UNALIGNED="no"
 		JIT_SUPPORTED=yes
 
@@ -2220,6 +2218,7 @@ case "$host" in
 			sgen_supported=true
 			;;
 		  cygwin*)
+			sgen_supported=true
 			have_visibility_hidden=no		  
 			;;
 		  haiku*)
@@ -2376,6 +2375,7 @@ esac
 
 if test "x$host" != "x$target"; then
    AC_DEFINE(MONO_CROSS_COMPILE,1,[The runtime is compiled for cross-compiling mode])
+   enable_mcs_build=no
    case "$target" in
    powerpc64-ps3-linux-gnu)
 		TARGET=POWERPC64
@@ -2475,6 +2475,9 @@ POWERPC64)
 S390x)
 	AC_DEFINE(TARGET_S390X, 1, [...])
 	;;
+MIPS)
+	AC_DEFINE(TARGET_MIPS, 1, [...])
+	;;
 esac
 
 if test "x$sizeof_register" = "x4"; then
@@ -2662,12 +2665,19 @@ if test ${TARGET} = ARM && test x$cross_compiling = xno && test x$enable_mcs_bui
 	dnl ******************************************
 	AC_MSG_CHECKING(which FPU to use)
 
-	ORIG_CFLAGS=$CFLAGS
-	CFLAGS="$CFLAGS -mfpu=vfp -mfloat-abi=softfp"
-	AC_TRY_RUN([
-		int main () { __asm__ ("faddd	d7, d6, d7"); return 0; }
-			], fpu=VFP, fpu=NONE)
-	CFLAGS=$ORIG_CFLAGS
+	fpu=NONE
+	if gcc -v 2>&1 | grep -q -- '--with-float=hard'; then
+	   fpu=VFP_HARD
+	fi
+
+	if test x$fpu = xNONE; then
+	   ORIG_CFLAGS=$CFLAGS
+	   CFLAGS="$CFLAGS -mfpu=vfp -mfloat-abi=softfp"
+	   AC_TRY_RUN([
+				int main () { __asm__ ("faddd	d7, d6, d7"); return 0; }
+				], fpu=VFP, fpu=NONE)
+	   CFLAGS=$ORIG_CFLAGS
+	fi
 
 	if test x$fpu = xNONE; then
 		AC_TRY_COMPILE([], [
@@ -2794,6 +2804,9 @@ else
 fi
 AC_SUBST(docs_dir)
 
+## Maybe should also disable if mcsdir is invalid.  Let's punt the issue for now.
+AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_build != xno])
+
 AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes)
 AC_SUBST(OPROFILE_CFLAGS)
 AC_SUBST(OPROFILE_LIBS)
@@ -2981,6 +2994,20 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/machine.config],
     cd $depth
 ],[LN_S='$LN_S'])
 
+AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/web.config],
+[   depth=../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/4.5
+    cd runtime/etc/mono/4.5
+    rm -f web.config
+    $LN_S $reldir/data/net_4_5/web.config web.config
+    cd $depth
+],[LN_S='$LN_S'])
+
 if test x$enable_quiet_build = xyes; then
    AC_CONFIG_COMMANDS([quiet], [for i in `find mono libgc support -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do if test -f $i; then $srcdir/scripts/patch-quiet.sh $i; fi; done], [shell=$SHELL])
    AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/echo "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])