From e9c2341b1384c161bbab9871411af0bc9f6c3cf4 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 2 Aug 2011 11:40:44 -0400 Subject: [PATCH] Don't use icu-config when cross-compiling --- configure.ac | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index da1cc6ac5..dcc68d0ff 100644 --- a/configure.ac +++ b/configure.ac @@ -103,13 +103,16 @@ AM_CONDITIONAL(HAVE_CAIRO_FT, $have_cairo_ft) dnl ========================================================================== PKG_CHECK_MODULES(ICU, icu, have_icu=true, [ - AC_CHECK_PROG([have_icu], [icu-config], [true], [false]) - if $have_icu; then - icu_cflags=`icu-config --cppflags` - icu_libs=`icu-config --ldflags-libsonly` - icu_cflags=`echo "$icu_cflags" | sed "s@ -I/usr/include @ @"` - AC_SUBST(ICU_CFLAGS, [$icu_cflags]) - AC_SUBST(ICU_LIBS, [$icu_libs]) + have_icu=false + if test $cross_compiling == no; then + AC_CHECK_PROG([have_icu], [icu-config], [true], [false]) + if $have_icu; then + icu_cflags=`icu-config --cppflags` + icu_libs=`icu-config --ldflags-libsonly` + icu_cflags=`echo "$icu_cflags" | sed "s@ -I/usr/include @ @"` + AC_SUBST(ICU_CFLAGS, [$icu_cflags]) + AC_SUBST(ICU_LIBS, [$icu_libs]) + fi fi ]) if $have_icu; then