[HarfBuzz] harfbuzz-ng: Branch 'master' - 3 commits

[Behdad Esfahbod]

 configure.ac     |   16 ++++++++++------
 test/Makefile.am |    3 ++-
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit c21be799daa85d5edb2d831ac985d3e43c8755ec
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Aug 2 12:05:49 2011 -0400

    Minor

diff --git a/test/Makefile.am b/test/Makefile.am
index bad1118..b1a9b87 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -121,7 +121,8 @@ check-symbols: symbols-untested.txt
 
 
 else
-check-am:
+check-am: err-glib
+err-glib:
 	@echo "You need to have glib support enabled to run the tests"
 	@exit 77
 endif
commit e9c2341b1384c161bbab9871411af0bc9f6c3cf4
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Aug 2 11:40:44 2011 -0400

    Don't use icu-config when cross-compiling

diff --git a/configure.ac b/configure.ac
index da1cc6a..dcc68d0 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
commit 390dab49b6cf34f263b67d20a13f0752ada57bcc
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Aug 2 11:29:55 2011 -0400

    Unbreak icu-config results a bit

diff --git a/configure.ac b/configure.ac
index d2a2331..da1cc6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,7 @@ PKG_CHECK_MODULES(ICU, icu, have_icu=true, [
 	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