enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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
This commit is contained in:
Tom Hacohen 2011-01-30 10:42:01 +00:00
parent f63e8256ff
commit 32fd296bde
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/evas/configure.ac
View File

@ -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