From f91b34e293a2edfd3c7025d02e64759cd6712bb0 Mon Sep 17 00:00:00 2001
From: Zoltan Varga <vargaz@gmail.com>
Date: Thu, 25 Aug 2005 13:53:44 +0000
Subject: [PATCH] 2005-08-25  Zoltan Varga  <vargaz@freemail.hu>

	* configure.in: Pass --enable-win32-dllmain to libgc configure. Build the runtime as a dll under windows.

svn path=/trunk/mono/; revision=48834
---
 ChangeLog    |  4 ++++
 configure.in | 12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 96cd5a4df5f..45c1c5d8926 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-25  Zoltan Varga  <vargaz@freemail.hu>
+
+	* configure.in: Pass --enable-win32-dllmain to libgc configure. Build the runtime as a dll under windows.
+
 2005-08-24  Zoltan Varga  <vargaz@gmail.com>
 
 	* configure.in: Add -lunwind to ldflags on IA64.
diff --git a/configure.in b/configure.in
index a33a65f735b..8c8f8c9e604 100644
--- a/configure.in
+++ b/configure.in
@@ -25,6 +25,7 @@ dnl
 gc_headers=no
 gc=included
 use_included_gc=no
+libgc_configure_args=
 
 if test -d $srcdir/libgc ; then
   gc_default=included
@@ -58,8 +59,6 @@ case "$host" in
 		HOST_CC="gcc"
 		# So libgc configure gets -mno-cygwin
 		export CC
-# latest libgc already defines GC_WIN32_THREADS
-#		CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS -DWIN32_THREADS"
 		CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024"
 		libdl=
 		libgc_threads=win32
@@ -67,6 +66,8 @@ case "$host" in
 		with_nptl=default
 		with_sigaltstack=no
 		LN_S=cp
+		# This forces libgc to use the DllMain based thread registration code on win32
+		libgc_configure_args="$libgc_configure_args --enable-win32-dllmain=yes"
 		;;
 	*-*-*netbsd*)
 		platform_win32=no
@@ -453,6 +454,11 @@ if test "x$enable_static" = "xno"; then
    with_static_mono=no
 fi
 
+if test "x$platform_win32" = "xyes"; then
+   # Boehm GC requires the runtime to be in its own dll
+   with_static_mono=no
+fi
+
 AM_CONDITIONAL(STATIC_MONO, test x$with_static_mono != xno)
 
 AC_ARG_ENABLE(minimal, [  --enable-minimal=LIST      drop support for LIST subsystems.
@@ -559,7 +565,7 @@ if test "x$large_heap" = "xyes"; then
 fi
 
 # tell libgc/configure about what we want
-ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads"
+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)
-- 
2.25.1