From 836b16f08509dc22a344341d54b90a29c00b9ff1 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 30 Jan 2011 10:36:24 +0000 Subject: [PATCH] Evas: fine tuned the harfbuzz checks to make sure harfbuzz was compiled with freetype support and just check if it also compiled with glib support. ATM there's no good lib for checking unicode characteristics so until there is one, we optionally use harfbuzz's glib integration - such lib is planned by the guy who wrote Harfbuzz. SVN revision: 56454 --- legacy/evas/configure.ac | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac index 29774a44e7..dc7dbc1810 100644 --- a/legacy/evas/configure.ac +++ b/legacy/evas/configure.ac @@ -305,6 +305,8 @@ fi # harfbuzz support have_harfbuzz="no" +have_harfbuzz_glib="no" +have_harfbuzz_ft="no" AC_ARG_ENABLE([harfbuzz], AC_HELP_STRING([--disable-harfbuzz], [disable complex text shaping and layouting support. @<:@default=enabled@:>@]), @@ -329,6 +331,33 @@ if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then AC_MSG_ERROR([Harfbuzz not found (strict dependencies checking)]) fi ]) + if test "x$have_harfbuzz" = "xyes" ; then + + CPPFLAGS_SAVE="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $HARFBUZZ_CFLAGS" +# must have for usage with harfbuzz although harfbuzz may not have it. + + AC_CHECK_HEADER(hb-ft.h, + [ + have_harfbuzz_ft="yes" + ], + [ + if test "x$want_harfbuzz" = "xyes" -a "x$use_strict" = "xyes" ; then + AC_MSG_ERROR([Harfbuzz-ft not found (strict dependencies checking)]) + 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 if test "x${have_harfbuzz}" = "xno"; then