Author: zoltan
Date: 2005-04-15 08:35:09 -0400 (Fri, 15 Apr 2005)
New Revision: 43040
Modified:
trunk/mono/ChangeLog
trunk/mono/configure.in
Log:
2005-04-15 Zoltan Varga <[EMAIL PROTECTED]>
* configure.in: Applied another freebsd patch from Bill Middleton
([EMAIL PROTECTED]).
Modified: trunk/mono/ChangeLog
===================================================================
--- trunk/mono/ChangeLog 2005-04-15 12:21:09 UTC (rev 43039)
+++ trunk/mono/ChangeLog 2005-04-15 12:35:09 UTC (rev 43040)
@@ -1,3 +1,16 @@
+2005-04-15 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * configure.in: Applied another freebsd patch from Bill Middleton
([EMAIL PROTECTED]).
+
+2005-04-14 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * mono/Makefile.am (DIST_SUBDIRS): Add 'handles' directory.
+ * configure.in (AC_OUTPUT): Add back 'mono/handles' directory.
+
+2005-04-13 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * configure.in (AC_OUTPUT): Remove 'mono/handles' directory.
+
2005-04-12 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* configure.in: added checks for epoll().
Modified: trunk/mono/configure.in
===================================================================
--- trunk/mono/configure.in 2005-04-15 12:21:09 UTC (rev 43039)
+++ trunk/mono/configure.in 2005-04-15 12:35:09 UTC (rev 43040)
@@ -114,8 +114,8 @@
libmono_cflags="$PTHREAD_CFLAGS"
fi
if test "x$PTHREAD_LIBS" = "x"; then
- LDFLAGS="$LDFLAGS -lpthread"
- libmono_ldflags="-lpthread"
+ LDFLAGS="$LDFLAGS -lthr"
+ libmono_ldflags="-lthr"
else
LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
libmono_ldflags="$PTHREAD_LIBS"
@@ -123,11 +123,11 @@
need_link_unlink=yes
AC_DEFINE(PTHREAD_POINTER_ID)
libdl=
+ with_sigaltstack=yes
libgc_threads=pthreads
# TLS is only partially implemented on 5-STABLE (compiler support
# but NOT library support)
#
- with_nptl=no
with_tls=pthread
;;
*-*-*freebsd6*)
@@ -136,37 +136,12 @@
CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
libmono_cflags=
else
- CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS
-DGC_FREEBSD_THREADS"
- libmono_cflags="$PTHREAD_CFLAGS"
- fi
- if test "x$PTHREAD_LIBS" = "x"; then
- LDFLAGS="$LDFLAGS -pthread"
- libmono_ldflags="-pthread"
- else
- LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- libmono_ldflags="$PTHREAD_LIBS"
- fi
- need_link_unlink=yes
- AC_DEFINE(PTHREAD_POINTER_ID)
- libdl=
- libgc_threads=pthreads
-# TLS is only partially implemented on -CURRENT (compiler support
-# but NOT library support)
-#
- with_tls=pthread
- ;;
- *-*-*freebsd6*)
- platform_win32=no
- if test "x$PTHREAD_CFLAGS" = "x"; then
- CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
- libmono_cflags=
- else
CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS
-DGC_FREEBSD_THREADS"
libmono_cflags="$PTHREAD_CFLAGS"
fi
if test "x$PTHREAD_LIBS" = "x"; then
- LDFLAGS="$LDFLAGS -lpthread"
- libmono_ldflags="-lpthread"
+ LDFLAGS="$LDFLAGS -lthr"
+ libmono_ldflags="-lthr"
else
LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
libmono_ldflags="$PTHREAD_LIBS"
@@ -866,6 +841,14 @@
*-*-*freebsd4*)
AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
;;
+ *-*-*freebsd5*)
+ # libthr is preferrable on CURRENT
+ AC_CHECK_LIB(thr, main, LIBS="$LIBS -lthr")
+ ;;
+ *-*-*freebsd6*)
+ # libthr is preferrable on CURRENT
+ AC_CHECK_LIB(thr, main, LIBS="$LIBS -lthr")
+ ;;
*)
AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
;;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
