forked from enlightenment/efl
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:
parent
f63e8256ff
commit
32fd296bde
|
@ -323,7 +323,6 @@ if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then
|
||||||
[harfbuzz >= 0.2],
|
[harfbuzz >= 0.2],
|
||||||
[
|
[
|
||||||
have_harfbuzz="yes"
|
have_harfbuzz="yes"
|
||||||
AC_DEFINE(HAVE_HARFBUZZ, 1, [have harfbuzz support])
|
|
||||||
requirement_evas="harfbuzz ${requirement_evas}"
|
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
|
if test "x$have_harfbuzz" = "xyes" ; then
|
||||||
|
|
||||||
CPPFLAGS_SAVE="$CPPFLAGS"
|
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.
|
# must have for usage with harfbuzz although harfbuzz may not have it.
|
||||||
|
|
||||||
AC_CHECK_HEADER(hb-ft.h,
|
AC_CHECK_HEADER(hb-ft.h,
|
||||||
[
|
[
|
||||||
have_harfbuzz_ft="yes"
|
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
|
if test "x$want_harfbuzz" = "xyes" -a "x$use_strict" = "xyes" ; then
|
||||||
|
|
Loading…
Reference in New Issue