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

Luca Barbato git at videolan.org
Mon Jan 6 17:49:51 CET 2014


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

configure: Update freetype check to follow upstream

The freetype tutorial suggests to use #include FT_FREETYPE_H.

Bug-Id: 616

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

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

diff --git a/configure b/configure
index d44dab2..7c3a9f8 100755
--- a/configure
+++ b/configure
@@ -3910,7 +3910,7 @@ enabled frei0r            && { check_header frei0r.h || die "ERROR: frei0r.h hea
 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            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
                                    check_lib "${gsm_hdr}" gsm_create -lgsm && break;
                                done || die "ERROR: libgsm not found"; }



More information about the ffmpeg-cvslog mailing list