Enable sgen on mingw64.
authorZoltan Varga <vargaz@gmail.com>
Mon, 14 Jul 2014 18:03:53 +0000 (20:03 +0200)
committerZoltan Varga <vargaz@gmail.com>
Mon, 14 Jul 2014 18:03:53 +0000 (20:03 +0200)
configure.ac

index 0f3d76801f20d882c65a66bc3a5c641755a33035..9e4ce16ee266daaf65cc0c7c5bdae371e869f22f 100644 (file)
@@ -650,6 +650,18 @@ if test "x$USE_NLS" = "xyes"; then
    fi
 fi
 
+AC_ARG_WITH([libgdiplus], 
+       [  --with-libgdiplus=installed|sibling|<path>   Override the libgdiplus used for System.Drawing tests (defaults to installed)], 
+       [], [with_libgdiplus=installed])
+
+case $with_libgdiplus in
+no|installed) libgdiplus_loc= ;;
+yes|sibling) libgdiplus_loc=`cd ../libgdiplus && pwd`/src/libgdiplus.la ;;
+/*) libgdiplus_loc=$with_libgdiplus ;;
+*) libgdiplus_loc=`pwd`/$with_libgdiplus ;;
+esac
+AC_SUBST([libgdiplus_loc])
+
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
 pkg_config_path=
@@ -2583,6 +2595,9 @@ case "$host" in
                  openbsd*|freebsd*)
                        sgen_supported=true
                        ;;
+                 mingw*)
+                       sgen_supported=true
+                       ;;
                esac
                case "$host" in
                        x86_64-*-nacl*)
@@ -3001,33 +3016,6 @@ esac
 
 AC_SUBST(libsuffix)
 
-AC_ARG_WITH([libgdiplus],
-       [  --with-libgdiplus=installed|sibling|<path>   Override the libgdiplus used for System.Drawing tests (defaults to installed)],
-       [], [with_libgdiplus=installed])
-
-# default install location
-libgdiplus_install_loc=libgdiplus${libsuffix}
-case $with_libgdiplus in
-    no|installed)
-    libgdiplus_loc=
-    ;;
-
-    yes|sibling)
-    libgdiplus_loc=`cd ../libgdiplus && pwd`/src/libgdiplus.la
-    ;;
-
-    /*) # absolute path, assume it is an install location
-    libgdiplus_loc=$with_libgdiplus
-    libgdiplus_install_loc=$with_libgdiplus
-    ;;
-
-    *)
-    libgdiplus_loc=`pwd`/$with_libgdiplus
-    ;;
-esac
-AC_SUBST([libgdiplus_loc])
-AC_SUBST([libgdiplus_install_loc])
-
 AC_ARG_ENABLE(icall-symbol-map,[  --enable-icall-symbol-map Generate tables which map icall functions to their C symbols], icall_symbol_map=$enableval, icall_symbol_map=no)
 if test "x$icall_symbol_map" = "xyes"; then
    AC_DEFINE(ENABLE_ICALL_SYMBOL_MAP, 1, [Icall symbol map enabled])