Evas font-engine: Remove dependency or harfbuzz being built with glib.

Harfbuzz needs unicode querying functions in order to work properly,
until there'll be a nice lib that does that (should be under dev) we have
to depend on an outside source. This commit uses new Harfbuzz API that
lets us not care about the unicode function provider and just let harfbuzz
to manage it on it's own.

SVN revision: 58961
This commit is contained in:
Tom Hacohen 2011-04-27 14:00:00 +00:00
parent 722707547a
commit 2ca672d8b4
2 changed files with 2 additions and 15 deletions

View File

@ -302,7 +302,6 @@ fi
# harfbuzz support
have_harfbuzz="no"
have_harfbuzz_glib="no"
have_harfbuzz_ft="no"
AC_ARG_ENABLE([harfbuzz],
AC_HELP_STRING([--disable-harfbuzz],
@ -345,15 +344,6 @@ if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then
fi
have_harfbuzz="no"
])
# nice to have if harfbuzz has it
AC_CHECK_HEADER(hb-glib.h,
[
have_harfbuzz_glib="yes"
AC_DEFINE(HAVE_HARFBUZZ_GLIB, 1, [have harfbuzz glib support])
],
[
have_harfbuzz_glib="no"
])
CPPFLAGS="$CPPFLAGS_SAVE"
fi
fi

View File

@ -21,17 +21,14 @@
#ifdef USE_HARFBUZZ
# include <hb.h>
# ifdef HAVE_HARFBUZZ_GLIB
# include <hb-glib.h>
# endif
#endif
/* FIXME: rename and move */
void *
evas_common_language_unicode_funcs_get(void)
{
#if defined(USE_HARFBUZZ) && defined(HAVE_HARFBUZZ_GLIB)
return hb_glib_get_unicode_funcs();
#if defined(USE_HARFBUZZ)
return hb_unicode_funcs_get_default();
#endif
return NULL;
}