From 32fd296bde93c7eb8fe68a6aea843f2653b4c604 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 30 Jan 2011 10:42:01 +0000 Subject: [PATCH] Evas: Fixed harfbuzz dependency checking. Was broken with harfbuzz that is not compiled with freetype support and always printed 'no' regarding harfbuzz usage. SVN revision: 56507 --- legacy/evas/configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac index dc7dbc1810..c2ecafc2ca 100644 --- a/legacy/evas/configure.ac +++ b/legacy/evas/configure.ac @@ -323,7 +323,6 @@ if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then [harfbuzz >= 0.2], [ have_harfbuzz="yes" - AC_DEFINE(HAVE_HARFBUZZ, 1, [have harfbuzz support]) requirement_evas="harfbuzz ${requirement_evas}" ], [ @@ -334,12 +333,14 @@ if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then if test "x$have_harfbuzz" = "xyes" ; then CPPFLAGS_SAVE="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $HARFBUZZ_CFLAGS" + CPPFLAGS="$CPPFLAGS $HARFBUZZ_CFLAGS $FREETYPE_CFLAGS" # must have for usage with harfbuzz although harfbuzz may not have it. AC_CHECK_HEADER(hb-ft.h, [ have_harfbuzz_ft="yes" + #Depend on harfbuzz ft for harfbuzz support + AC_DEFINE(HAVE_HARFBUZZ, 1, [have harfbuzz support]) ], [ if test "x$want_harfbuzz" = "xyes" -a "x$use_strict" = "xyes" ; then