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.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@58961 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index ec0a8f0..0a995ed 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/src/lib/engines/common/language/evas_language_utils.c b/src/lib/engines/common/language/evas_language_utils.c
index 276d83c..a367d31 100644 (file)
--- a/src/lib/engines/common/language/evas_language_utils.c
+++ b/src/lib/engines/common/language/evas_language_utils.c
@@ -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;
 }