forked from enlightenment/efl
Evas: Added harfbuzz detection (it's optional, just like fribidi).
SVN revision: 56440
This commit is contained in:
parent
109886f436
commit
f6b1bcd0b6
|
@ -89,6 +89,7 @@ AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
|
||||||
|
|
||||||
want_fontconfig="auto"
|
want_fontconfig="auto"
|
||||||
want_fribidi="auto"
|
want_fribidi="auto"
|
||||||
|
want_harfbuzz="auto"
|
||||||
want_evas_cserve="yes"
|
want_evas_cserve="yes"
|
||||||
|
|
||||||
want_evas_engine_buffer="yes"
|
want_evas_engine_buffer="yes"
|
||||||
|
@ -302,6 +303,38 @@ if test "x${have_fribidi}" = "xno"; then
|
||||||
HAS_BIDI=0
|
HAS_BIDI=0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# harfbuzz support
|
||||||
|
have_harfbuzz="no"
|
||||||
|
AC_ARG_ENABLE([harfbuzz],
|
||||||
|
AC_HELP_STRING([--disable-harfbuzz],
|
||||||
|
[disable complex text shaping and layouting support. @<:@default=enabled@:>@]),
|
||||||
|
[
|
||||||
|
if test "x${enableval}" = "xyes" ; then
|
||||||
|
want_harfbuzz="yes"
|
||||||
|
else
|
||||||
|
want_harfbuzz="no"
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then
|
||||||
|
PKG_CHECK_MODULES([HARFBUZZ],
|
||||||
|
[harfbuzz >= 0.2],
|
||||||
|
[
|
||||||
|
have_harfbuzz="yes"
|
||||||
|
AC_DEFINE(HAVE_HARFBUZZ, 1, [have harfbuzz support])
|
||||||
|
requirement_evas="harfbuzz ${requirement_evas}"
|
||||||
|
],
|
||||||
|
[
|
||||||
|
if test "x$want_harfbuzz" = "xyes" -a "x$use_strict" = "xyes" ; then
|
||||||
|
AC_MSG_ERROR([Harfbuzz not found (strict dependencies checking)])
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x${have_harfbuzz}" = "xno"; then
|
||||||
|
HAS_HARFBUZZ=0
|
||||||
|
fi
|
||||||
|
|
||||||
### Checks for header files
|
### Checks for header files
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
AC_CHECK_HEADERS([unistd.h stdint.h sys/param.h])
|
AC_CHECK_HEADERS([unistd.h stdint.h sys/param.h])
|
||||||
|
@ -1639,7 +1672,10 @@ echo " EET.....................: $have_evas_font_loader_eet"
|
||||||
echo
|
echo
|
||||||
echo "Font Searching Systems:"
|
echo "Font Searching Systems:"
|
||||||
echo " Fontconfig..............: $have_fontconfig"
|
echo " Fontconfig..............: $have_fontconfig"
|
||||||
|
echo
|
||||||
|
echo "Font Rendering Helpers:"
|
||||||
echo " Fribidi.................: $have_fribidi"
|
echo " Fribidi.................: $have_fribidi"
|
||||||
|
echo " Harfbuzz................: $have_harfbuzz"
|
||||||
# FIXME: add non freetype2 font engine support
|
# FIXME: add non freetype2 font engine support
|
||||||
# FIXME: make freetype2 optional
|
# FIXME: make freetype2 optional
|
||||||
echo
|
echo
|
||||||
|
|
|
@ -185,6 +185,7 @@ AM_CPPFLAGS = \
|
||||||
@EINA_CFLAGS@ \
|
@EINA_CFLAGS@ \
|
||||||
@FREETYPE_CFLAGS@ \
|
@FREETYPE_CFLAGS@ \
|
||||||
@FRIBIDI_CFLAGS@ \
|
@FRIBIDI_CFLAGS@ \
|
||||||
|
@HARFBUZZ_CFLAGS@ \
|
||||||
@EET_CFLAGS@ \
|
@EET_CFLAGS@ \
|
||||||
@FONTCONFIG_CFLAGS@ \
|
@FONTCONFIG_CFLAGS@ \
|
||||||
@pthread_cflags@
|
@pthread_cflags@
|
||||||
|
@ -212,6 +213,7 @@ $(libevas_cserve_la) \
|
||||||
engines/common/libevas_engine_common.la \
|
engines/common/libevas_engine_common.la \
|
||||||
@FREETYPE_LIBS@ \
|
@FREETYPE_LIBS@ \
|
||||||
@FRIBIDI_LIBS@ \
|
@FRIBIDI_LIBS@ \
|
||||||
|
@HARFBUZZ_LIBS@ \
|
||||||
@EET_LIBS@ \
|
@EET_LIBS@ \
|
||||||
@FONTCONFIG_LIBS@ \
|
@FONTCONFIG_LIBS@ \
|
||||||
@pthread_libs@ \
|
@pthread_libs@ \
|
||||||
|
|
Loading…
Reference in New Issue