2002-02-13 Jeffrey Stedfast <fejj@ximian.com>

	* acconfig.h: #undef USE_MONO_MUTEX

	* configure.in: If the system pthread implementation is lacking,
	default to using mono-mutex.

svn path=/trunk/mono/; revision=2375

diff --git a/ChangeLog b/ChangeLog
index a08f0113d06d1cad3652e0997fbc44c3b7b2b260..ce01973f9ec4cb1ae03ec41f2e8975ef08f0de86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-13  Jeffrey Stedfast  <fejj@ximian.com>
+
+       * acconfig.h: #undef USE_MONO_MUTEX
+
+       * configure.in: If the system pthread implementation is lacking,
+       default to using mono-mutex.
+
 2002-02-05  Dietmar Maurer  <dietmar@ximian.com>
 
        * mono/tests/enum2.cs: new file with more enum tests.

diff --git a/acconfig.h b/acconfig.h
index f78d17c4b8d26059121cf2abc125d7a4258543c1..9f3b620fe9c749113a40fc41a6e24f0fd48d92e1 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,5 +1,6 @@
 #undef HAVE_PTHREAD
 #undef HAVE_PTHREAD_MUTEX_TIMEDLOCK
+#undef USE_MONO_MUTEX
 #undef HAVE_LARGE_FILE_SUPPORT
 #undef PLATFORM_WIN32
 #undef PLATFORM_WIN32_NATIVE

diff --git a/configure.in b/configure.in
index 948a34113e3b0492a7088f8a8b37e08806fcf061..f0c99d4e4be10ef6a34e0c5ff371f8d29ddf79df 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -228,7 +228,8 @@ if test x$platform_win32 = xno; then
                        ], [
                                AC_MSG_RESULT(no)
                                dnl Add other variants here
-                               AC_MSG_ERROR([PTHREAD_MUTEX_RECURSIVE not found])
+                               AC_MSG_WARN(Using mono_mutex_t for recursive mutexes)
+                               AC_DEFINE(USE_MONO_MUTEX)
                        ])
                ])
                CPPFLAGS=$orig_CPPFLAGS