walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove gthread leftovers 

We don't use gthread anymore, remove leftovers.
This commit is contained in:
Behdad Esfahbod 2013-03-21 16:26:39 -04:00
parent b93de1ea08
commit 0a2b2a505b
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -142,12 +142,6 @@ if $have_glib; then
fi fi
AM_CONDITIONAL(HAVE_GLIB, $have_glib) 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) PKG_CHECK_MODULES(GOBJECT, gobject-2.0 glib-2.0 >= 2.16, have_gobject=true, have_gobject=false)
if $have_gobject; then if $have_gobject; then
AC_DEFINE(HAVE_GOBJECT, 1, [Have gobject2 library]) AC_DEFINE(HAVE_GOBJECT, 1, [Have gobject2 library])

4
test/api/Makefile.am
View File

@ -7,8 +7,8 @@ DISTCLEANFILES =
MAINTAINERCLEANFILES = MAINTAINERCLEANFILES =
if HAVE_GLIB if HAVE_GLIB
AM_CPPFLAGS = -DSRCDIR="\"$(srcdir)\"" -I$(top_srcdir)/src/ -I$(top_builddir)/src/ $(GLIB_CFLAGS) $(GTHREAD_CFLAGS) AM_CPPFLAGS = -DSRCDIR="\"$(srcdir)\"" -I$(top_srcdir)/src/ -I$(top_builddir)/src/ $(GLIB_CFLAGS)
LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS) $(GTHREAD_LIBS) LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS)
EXTRA_DIST += hb-test.h EXTRA_DIST += hb-test.h

3
test/api/hb-test.h
View File

@ -76,9 +76,6 @@ srcdir (void)
static inline void static inline void
hb_test_init (int *argc, char ***argv) 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); g_test_init (argc, argv, NULL);
} }