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

Luca Barbato git at videolan.org
Tue Jun 3 01:01:51 CEST 2014


ffmpeg | branch: release/0.10 | Luca Barbato <lu_zero at gentoo.org> | Sat Dec 21 17:59:59 2013 +0100| [bf0cb89a8d11d418cdf351fe5d91240ce92cd71d] | 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)

Conflicts:
	configure

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

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

diff --git a/configure b/configure
index f9eac08..bcfbe4e 100755
--- a/configure
+++ b/configure
@@ -2946,7 +2946,7 @@ enabled libdirac   && require_pkg_config dirac                          \
     "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h"  \
     "dirac_decoder_init dirac_encoder_init"
 enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
-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 libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
 enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut



More information about the ffmpeg-cvslog mailing list