diff --git a/configure.ac b/configure.ac index 4f05c1d937d1cb08b55a2fffd3210c1311a683e2..df55767778067cefd4134cd5f48ef9a004c16728 100644 --- a/configure.ac +++ b/configure.ac @@ -142,12 +142,6 @@ if $have_glib; then fi AM_CONDITIONAL(HAVE_GLIB, $have_glib) -PKG_CHECK_MODULES(GTHREAD, gthread-2.0, have_gthread=true, have_gthread=false) -if $have_gthread; then - AC_DEFINE(HAVE_GTHREAD, 1, [Have gthread2 library]) -fi -AM_CONDITIONAL(HAVE_GTHREAD, $have_gthread) - PKG_CHECK_MODULES(GOBJECT, gobject-2.0 glib-2.0 >= 2.16, have_gobject=true, have_gobject=false) if $have_gobject; then AC_DEFINE(HAVE_GOBJECT, 1, [Have gobject2 library]) diff --git a/test/api/Makefile.am b/test/api/Makefile.am index 0ed943bb9b0fe6e3acfda4b071bc6e60c65a65d4..99548a290895fa94cf90da26ebc71dfb1989e407 100644 --- a/test/api/Makefile.am +++ b/test/api/Makefile.am @@ -7,8 +7,8 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = if HAVE_GLIB -AM_CPPFLAGS = -DSRCDIR="\"$(srcdir)\"" -I$(top_srcdir)/src/ -I$(top_builddir)/src/ $(GLIB_CFLAGS) $(GTHREAD_CFLAGS) -LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS) $(GTHREAD_LIBS) +AM_CPPFLAGS = -DSRCDIR="\"$(srcdir)\"" -I$(top_srcdir)/src/ -I$(top_builddir)/src/ $(GLIB_CFLAGS) +LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS) EXTRA_DIST += hb-test.h diff --git a/test/api/hb-test.h b/test/api/hb-test.h index 8655f41f42e76a354b58237d746fe71a54ae1222..4d41218bf46304a79865f0ff3bb52256fd1fe166 100644 --- a/test/api/hb-test.h +++ b/test/api/hb-test.h @@ -76,9 +76,6 @@ srcdir (void) static inline void hb_test_init (int *argc, char ***argv) { -#if !GLIB_CHECK_VERSION(2,32,0) - g_thread_init (NULL); -#endif g_test_init (argc, argv, NULL); }