From 0c2ec1d78bfa0166ffd4afc204c2668d4f456ed9 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 10 May 2011 19:11:27 -0400
Subject: [PATCH] [test] Always initialize gthread such that our mutex() stuff
 is tested

Now the test/object test deadlocks as expected.  Fix coming.
---
 configure.ac     | 1 +
 test/Makefile.am | 4 ++--
 test/hb-test.h   | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2eb6c11..96dbca5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,7 @@ fi
 dnl ==========================================================================
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, have_glib=true, have_glib=false)
+PKG_CHECK_MODULES(GTHREAD, gthread-2.0, , have_glib=false)
 if $have_glib; then
 	AC_DEFINE(HAVE_GLIB, 1, [Have glib2 library])
 fi
diff --git a/test/Makefile.am b/test/Makefile.am
index cc4519c..e58a91a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,8 +3,8 @@ include Makefile.decl
 NULL =
 
 if HAVE_GLIB
-AM_CPPFLAGS = -I$(top_srcdir)/src/ $(GLIB_CFLAGS)
-LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS)
+AM_CPPFLAGS = -I$(top_srcdir)/src/ $(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
+LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS) $(GTHREAD_LIBS)
 
 EXTRA_DIST += hb-test.h
 
diff --git a/test/hb-test.h b/test/hb-test.h
index 5f72a05..938b700 100644
--- a/test/hb-test.h
+++ b/test/hb-test.h
@@ -54,6 +54,7 @@ HB_BEGIN_DECLS
 static inline void
 hb_test_init (int *argc, char ***argv)
 {
+  g_thread_init (NULL);
   g_test_init (argc, argv, NULL);
 }
 
-- 
2.7.4