Bug 716354 - freetype2 detection doesn't consider cross-compiling. r=…

…glandium
dothq · Apr 6, 2012 · 48061f5 · 48061f5
1 parent f6f94eb
commit 48061f5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 139 deletions.
diff --git a/aclocal.m4 b/aclocal.m4
@@ -7,7 +7,6 @@ builtin(include, build/autoconf/glib.m4)dnl
 builtin(include, build/autoconf/nspr.m4)dnl
 builtin(include, build/autoconf/nss.m4)dnl
 builtin(include, build/autoconf/pkg.m4)dnl
-builtin(include, build/autoconf/freetype2.m4)dnl
 builtin(include, build/autoconf/codeset.m4)dnl
 builtin(include, build/autoconf/altoptions.m4)dnl
 builtin(include, build/autoconf/mozprog.m4)dnl

diff --git a/build/autoconf/freetype2.m4 b/build/autoconf/freetype2.m4
diff --git a/configure.in b/configure.in
@@ -3380,7 +3380,7 @@ else
     dnl ========================================================
     dnl = Check for freetype2 and its functionality
     dnl ========================================================
-    AC_CHECK_FT2(6.1.0, [_HAVE_FREETYPE2=1], [_HAVE_FREETYPE2=])
+    PKG_CHECK_MODULES(FT2, freetype2 >= 6.1.0, _HAVE_FREETYPE2=1, _HAVE_FREETYPE2=)
 
     if test "$_HAVE_FREETYPE2"; then
     	_SAVE_LIBS="$LIBS"