configure.ac | 22 ++++++++-------------- test/api/Makefile.am | 4 ++-- test/api/hb-test.h | 3 --- 3 files changed, 10 insertions(+), 19 deletions(-)
New commits: commit 0a2b2a505b647f6b4802750c87cd9c5f0baaadef Author: Behdad Esfahbod <[email protected]> Date: Thu Mar 21 16:26:39 2013 -0400 Remove gthread leftovers We don't use gthread anymore, remove leftovers. diff --git a/configure.ac b/configure.ac index 4f05c1d..df55767 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 0ed943b..99548a2 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 8655f41..4d41218 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); } commit b93de1ea085bfc0661ce3ad0e21fb5eba722c951 Author: Behdad Esfahbod <[email protected]> Date: Thu Mar 21 16:25:20 2013 -0400 Minor diff --git a/configure.ac b/configure.ac index f05ca65..4f05c1d 100644 --- a/configure.ac +++ b/configure.ac @@ -175,15 +175,15 @@ dnl ========================================================================== PKG_CHECK_MODULES(ICU, icu-uc, have_icu=true, have_icu=false) dnl Fallback to icu-config if ICU pkg-config files could not be found if test "$have_icu" != "true"; then - AC_PATH_PROG(icu_config, icu-config, no) + AC_CHECK_TOOL(ICU_CONFIG, icu-config, no) AC_MSG_CHECKING([for ICU by using icu-config fallback]) - if test "$icu_config" != "no" && "$icu_config" --version >/dev/null; then + if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then have_icu=true # We don't use --cflags as this gives us a lot of things that we don't # necessarily want, like debugging and optimization flags # See man (1) icu-config for more info. - ICU_CFLAGS=`$icu_config --cppflags` - ICU_LIBS=`$icu_config --ldflags-libsonly` + ICU_CFLAGS=`$ICU_CONFIG --cppflags` + ICU_LIBS=`$ICU_CONFIG --ldflags-libsonly` AC_SUBST(ICU_CFLAGS) AC_SUBST(ICU_LIBS) AC_MSG_RESULT([yes]) @@ -203,15 +203,15 @@ dnl ========================================================================== PKG_CHECK_MODULES(ICU_LE, icu-le icu-uc, have_icu_le=true, have_icu_le=false) dnl Fallback to icu-config if ICU pkg-config files could not be found if test "$have_icu_le" != "true"; then - AC_PATH_PROG(icu_config, icu-config, no) + AC_CHECK_TOOL(ICU_CONFIG, icu-config, no) AC_MSG_CHECKING([for ICU_LE by using icu-config fallback]) - if test "$icu_config" != "no" && "$icu_config" --version >/dev/null; then + if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then have_icu_le=true # We don't use --cflags as this gives us a lot of things that we don't # necessarily want, like debugging and optimization flags # See man (1) icu-config for more info. - ICU_LE_CFLAGS=`$icu_config --cppflags` - ICU_LE_LIBS=`$icu_config --ldflags-libsonly --ldflags-layout` + ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags` + ICU_LE_LIBS=`$ICU_CONFIG --ldflags-libsonly --ldflags-layout` AC_SUBST(ICU_LE_CFLAGS) AC_SUBST(ICU_LE_LIBS) AC_MSG_RESULT([yes]) _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
