From 0a2b2a505b647f6b4802750c87cd9c5f0baaadef Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 21 Mar 2013 16:26:39 -0400 Subject: [PATCH] Remove gthread leftovers We don't use gthread anymore, remove leftovers. --- configure.ac | 6 ------ test/api/Makefile.am | 4 ++-- test/api/hb-test.h | 3 --- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 4f05c1d9..df557677 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 0ed943bb..99548a29 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 8655f41f..4d41218b 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); } -- GitLab