comm-beta: changeset 11580:1c784b29d21da8db66016acfb85904552f12b4c9

author	Misak Khachatryan <misak.bugzilla@gmail.com>
	Sun, 08 Apr 2012 20:28:01 +0800
changeset 11580	1c784b29d21da8db66016acfb85904552f12b4c9
parent 11579	9998f4b4347942d266d1f428c81a4261d6cdcbe4
child 11581	abbe21c88c1aa64976bc16a69a3d476c6c2f448d
push id	529
push user	bugzilla@standard8.plus.com
push date	Mon, 04 Jun 2012 19:55:55 +0000
treeherder	comm-beta@109334822255 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	Neil, Callek
bugs	743441, 716354, 743437

Bug 743441 - Port |Bug 716354 - freetype2 detection doesn't consider cross-compiling| to comm-central f=sgautherie.bz r=Neil r=Callek. Also see Bug 743437 duplicate patch from Takanori MATSUURA <t.matsuu@gmail.com>.

--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2,17 +2,16 @@ dnl
 dnl Local autoconf macros used with mozilla
 dnl The contents of this file are under the Public Domain.
 dnl 
 
 builtin(include, mozilla/build/autoconf/glib.m4)dnl
 builtin(include, mozilla/build/autoconf/nspr.m4)dnl
 builtin(include, mozilla/build/autoconf/nss.m4)dnl
 builtin(include, mozilla/build/autoconf/pkg.m4)dnl
-builtin(include, mozilla/build/autoconf/freetype2.m4)dnl
 builtin(include, mozilla/build/autoconf/codeset.m4)dnl
 builtin(include, mozilla/build/autoconf/altoptions.m4)dnl
 builtin(include, mozilla/build/autoconf/mozprog.m4)dnl
 builtin(include, mozilla/build/autoconf/acwinpaths.m4)dnl
 builtin(include, mozilla/build/autoconf/lto.m4)dnl
 builtin(include, mozilla/build/autoconf/frameptr.m4)dnl
 builtin(include, mozilla/build/autoconf/compiler-opts.m4)dnl