[cairo-commit] cairo ChangeLog, 1.884, 1.885 configure.in, 1.122, 1.123

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv15701

Modified Files:
	ChangeLog configure.in 
Log Message:

2005-08-13  Carl Worth  <cworth at cworth.org>

        * src/cairoint.h: Turn the mutex code back on. It looks like the
        deadlocks have disappeared as of the cairo_scaled_font_map patch
        from two days ago.

        * configure.in: Setup an automake conditional for the HAVE_PTHREAD
        case.

        * test/Makefile.am: Link all tests with -lpthread if available, so
        that we can get some testing of cairo with mutexes turned on.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.884
retrieving revision 1.885
diff -u -d -r1.884 -r1.885
--- ChangeLog	13 Aug 2005 09:21:07 -0000	1.884
+++ ChangeLog	13 Aug 2005 10:26:18 -0000	1.885
@@ -1,5 +1,21 @@
 2005-08-13  Carl Worth  <cworth at cworth.org>
 
+	* src/cairoint.h: Turn the mutex code back on. It looks like the
+	deadlocks have disappeared as of the cairo_scaled_font_map patch
+	from two days ago.
+	
+	* configure.in: Setup an automake conditional for the HAVE_PTHREAD
+	case.
+	
+	* test/Makefile.am: Link all tests with -lpthread if available, so
+	that we can get some testing of cairo with mutexes turned on.
+
+2005-08-13  Carl Worth  <cworth at cworth.org>
+
+	* src/cairoint.h:
+
+2005-08-13  Carl Worth  <cworth at cworth.org>
+
 	Minor, cosmetic changes:
 
 	* src/cairo-ft-font.c: (_cairo_ft_unscaled_font_lock_face): Reowrd

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- configure.in	10 Aug 2005 19:36:51 -0000	1.122
+++ configure.in	13 Aug 2005 10:26:18 -0000	1.123
@@ -330,11 +330,8 @@
 
 dnl ===========================================================================
 
-#
-# The FreeType backend uses pthread locking when avaialble
-#
-
-AC_CHECK_HEADERS([pthread.h])
+AC_CHECK_HEADERS([pthread.h], have_pthread=yes, have_pthread=no)
+AM_CONDITIONAL(HAVE_PTHREAD, test "x$have_pthread" = "xyes")
 
 dnl ===========================================================================