walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove icu-config fallback for icu_le shaper 

Bug 64878 - compile error with ICU but not ICU
This commit is contained in:
Behdad Esfahbod 2013-05-27 19:05:23 -04:00
parent 932b747147
commit 7e6ebf7623
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -205,24 +205,6 @@ AM_CONDITIONAL(HAVE_ICU, $have_icu)
dnl ========================================================================== dnl ==========================================================================
PKG_CHECK_MODULES(ICU_LE, icu-le icu-uc, have_icu_le=true, have_icu_le=false) PKG_CHECK_MODULES(ICU_LE, icu-le icu-uc, have_icu_le=true, have_icu_le=false)
dnl Fallback to icu-config if ICU pkg-config files could not be found
if test "$have_icu_le" != "true"; then
AC_CHECK_TOOL(ICU_CONFIG, icu-config, no)
AC_MSG_CHECKING([for ICU_LE by using icu-config fallback])
if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then
have_icu_le=true
# We don't use --cflags as this gives us a lot of things that we don't
# necessarily want, like debugging and optimization flags
# See man (1) icu-config for more info.
ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags`
ICU_LE_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-layout`
AC_SUBST(ICU_LE_CFLAGS)
AC_SUBST(ICU_LE_LIBS)
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
fi
if $have_icu_le; then if $have_icu_le; then
AC_DEFINE(HAVE_ICU_LE, 1, [Have ICU Layout Engine library]) AC_DEFINE(HAVE_ICU_LE, 1, [Have ICU Layout Engine library])
fi fi