merge 100015:100420

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index b7f322ac902f09ededddfbb3b0b89e32c95a010c..7af857a0b9e074ceb92b82d9ce4b11731854fc25 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -70,7 +70,8 @@ case "$host" in
                        export CC
                fi
                HOST_CC="gcc"
-               CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024 -DUNICODE -D_UNICODE"
+               # Windows 2000 is required that includes Internet Explorer 5.01
+               CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
                libmono_cflags="-mno-cygwin"
                libmono_ldflags="-mno-cygwin"
                libdl=
@@ -249,6 +250,7 @@ if test x$need_link_unlink = xyes; then
 fi
 
 AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
+AM_CONDITIONAL(PLATFORM_LINUX, test x$target_os = xlinux-gnu)
 
 AC_CHECK_TOOL(CC, gcc, gcc)
 AC_PROG_CC
@@ -663,13 +665,6 @@ case "x$gc" in
                ;;
 
        xincluded)
-               AC_CONFIG_SUBDIRS(libgc)
-
-               # Pass CPPFLAGS to libgc configure
-               # Maybe we should use a separate variable for this to avoid passing useless and
-               # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
-               export CPPFLAGS
-
                found_boehm=yes
                gc_headers=yes
                use_included_gc=yes
@@ -717,9 +712,6 @@ if test "x$large_heap" = "xyes"; then
    CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG"
 fi
 
-# tell libgc/configure about what we want
-ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args"
-
 AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
 AC_SUBST(LIBGC_CFLAGS)
 AC_SUBST(LIBGC_LIBS)
@@ -1303,7 +1295,7 @@ if test x$platform_win32 = xno; then
        dnl *** Checks for math functions ***
        dnl *********************************
         LIBS="$LIBS -lm";
-       if text "x$has_broken_apple_cpp" != "xyes"; then
+       if test "x$has_broken_apple_cpp" != "xyes"; then
                AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h)
                        AC_TRY_LINK([#include <math.h>], 
                        [ finite(0.0); ], 
@@ -1986,6 +1978,17 @@ if test ${ACCESS_UNALIGNED} = no; then
        CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
 fi
 
+case "x$gc" in
+       xincluded)
+               # Pass CPPFLAGS to libgc configure
+               # We should use a separate variable for this to avoid passing useless and
+               # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
+               # This should be executed late so we pick up the final version of CPPFLAGS
+               ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS=$CPPFLAGS\""
+               AC_CONFIG_SUBDIRS(libgc)
+               ;;
+esac
+
 PREVIEW=yes
 AC_ARG_WITH(preview,  [ --with-preview=yes,no     If you want to install the 2.0 FX preview],[
        if test x$with_preview = xno; then
@@ -2127,6 +2130,20 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/browscap.ini],
     cd $depth
 ],[LN_S='$LN_S'])
 
+AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser],
+[   depth=../../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/2.0/Browsers/
+    cd runtime/etc/mono/2.0/Browsers
+    rm -f Compat.browser
+    $LN_S $reldir/data/net_2_0/Browsers/Compat.browser Compat.browser
+    cd $depth
+],[LN_S='$LN_S'])
+
 AC_OUTPUT([
 Makefile
 mono-uninstalled.pc
@@ -2175,6 +2192,7 @@ docs/Makefile
 data/Makefile
 data/net_1_1/Makefile
 data/net_2_0/Makefile
+data/net_2_0/Browsers/Makefile
 data/mint.pc
 data/mono.pc
 data/mono-cairo.pc