[cairo-commit] glitz ChangeLog,1.84,1.85 configure.in,1.21,1.22

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/glitz
In directory gabe:/tmp/cvs-serv10874

Modified Files:
	ChangeLog configure.in 
Log Message:
Fix thread support in egl backend

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/glitz/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- ChangeLog	7 Jun 2005 15:44:34 -0000	1.84
+++ ChangeLog	15 Jun 2005 06:02:51 -0000	1.85
@@ -1,3 +1,11 @@
+2005-06-15  David Reveman  <davidr at novell.com>
+
+	* src/egl/glitz_egl_info.c (glitz_egl_get_proc_address): Shut up
+	compiler.
+	PTHREADS is now defined in config.h.
+
+	* configure.in: Check for libpthread when building glitz-egl.
+
 2005-06-07  David Reveman  <davidr at novell.com>
 
 	* src/glitz.h (GLITZ_REVISION): Bump version to 0.4.3.

Index: configure.in
===================================================================
RCS file: /cvs/cairo/glitz/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- configure.in	15 Jun 2005 02:46:43 -0000	1.21
+++ configure.in	15 Jun 2005 06:02:51 -0000	1.22
@@ -203,9 +203,26 @@
   AC_HELP_STRING([--enable-egl], [Enable glitz's EGL backend]),
   [use_egl=$enableval], [use_egl=no])
 
-EGL_LIBS="-lGL -lEGL"
-EGL_CFLAGS="$EGL_CFLAGS"
-    
+if test "x$use_egl" = "xyes"; then
+  EGL_LIBS="-lGL -lEGL"
+  EGL_CFLAGS="$EGL_CFLAGS"
+  
+  save_libs="$LIBS"
+  LIBS="-lpthread"
+
+  AC_MSG_CHECKING([for PTHREADS])
+  AC_TRY_LINK_FUNC(pthread_key_create, [use_pthreads=yes], [use_pthreads=no])
+
+  LIBS="$save_LIBS"
+
+  if test "x$use_pthreads" = "xyes"
+  then
+    EGL_LIBS="$EGL_LIBS -lpthread"
+    AC_DEFINE(PTHREADS, 1)
+  fi
+  AC_MSG_RESULT($use_pthreads)
+fi
+
 if test "x$use_egl" = "xyes"; then
   AM_CONDITIONAL(GLITZ_BUILD_EGL_BACKEND, true)
 else