2004-09-07 Bernie Solomon <bernard@ugsolutions.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 92edc9a87d06c30e9a314b3b74cb88359f232226..e721806cbbd203ef7d23ceed3936bbb21e649d2c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ case "$host" in
        *-*-mingw*|*-*-cygwin*)
                platform_win32=yes
                AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32])
-               CC="gcc -mno-cygwin"
+               CC="gcc -mno-cygwin -g"
                HOST_CC="gcc"
                # So libgc configure gets -mno-cygwin
                export CC
@@ -51,8 +51,8 @@ case "$host" in
                CPPFLAGS="$CPPFLAGS -DWIN32_THREADS"
                libdl=
                libgc_threads=win32
-               gc_default=boehm 
-               with_nptl=no
+               gc_default=included
+               with_nptl=default
                with_sigaltstack=no
                LN_S=cp
 
@@ -330,6 +330,7 @@ AM_CONDITIONAL(WITH_BUNDLE, test x$with_bundle != xno)
 
 LIBGC_CFLAGS=
 LIBGC_LIBS=
+LIBGC_STATIC_LIBS=
 libgc_dir=
 case "x$gc" in
        xboehm|xbohem|xyes)
@@ -346,6 +347,7 @@ case "x$gc" in
                AC_DEFINE(HAVE_BOEHM_GC)
                AC_SUBST(HAVE_BOEHM_GC)
                LIBGC_LIBS="-lgc $libdl"
+               LIBGC_STATIC_LIBS="$LIBGC_LIBS"
 
                # AC_CHECK_FUNCS does not work for some reason...
                AC_CHECK_LIB(gc, GC_gcj_malloc, found_gcj_malloc="yes",,$libdl)
@@ -368,6 +370,7 @@ case "x$gc" in
 
                LIBGC_CFLAGS='-I$(top_srcdir)/libgc/include'
                LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la'
+               LIBGC_STATIC_LIBS='$(top_builddir)/libgc/libmonogc-static.la'
 
                AC_DEFINE(HAVE_BOEHM_GC)
                AC_SUBST(HAVE_BOEHM_GC)
@@ -395,6 +398,7 @@ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads
 AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
 AC_SUBST(LIBGC_CFLAGS)
 AC_SUBST(LIBGC_LIBS)
+AC_SUBST(LIBGC_STATIC_LIBS)
 AC_SUBST(libgc_dir)
 
 dnl
@@ -1283,6 +1287,14 @@ case "$host" in
        LIBC="libc.so.12"
        INTL="libintl.so.0"
        ;;
+    *-*-*freebsd*)
+       LIBC="libc.so"
+       INTL="libintl.so"
+       ;;
+    *-*-*openbsd*)
+       LIBC="libc.so"
+       INTL="libintl.so"
+       ;;
 esac
 AC_SUBST(libsuffix)