[FFmpeg-cvslog] configure: Update freetype check to follow upstream

Luca Barbato git at videolan.org
Mon Apr 21 14:18:04 CEST 2014


ffmpeg | branch: release/1.1 | Luca Barbato <lu_zero at gentoo.org> | Sat Dec 21 17:59:59 2013 +0100| [b00444c0bbbc78ae477ec697d6569893609f420d] | committer: Luca Barbato

configure: Update freetype check to follow upstream

The freetype tutorial suggests to use #include FT_FREETYPE_H.

Bug-Id: 616
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

(cherry picked from commit e61b8fa5605b16a02a2a0ea75afbfc31d7832bba)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b00444c0bbbc78ae477ec697d6569893609f420d
---

 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 2734003..569d29a 100755
--- a/configure
+++ b/configure
@@ -3492,7 +3492,7 @@ enabled frei0r     && { check_header frei0r.h || die "ERROR: frei0r.h header not
 enabled gnutls     && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
 enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
 enabled libfdk_aac && require  libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
-enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
+enabled libfreetype && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
 enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
 enabled libilbc    && require  libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
 enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame



More information about the ffmpeg-cvslog mailing list