aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2007-02-11 11:35:56 +0000
committerMåns Rullgård <mans@mansr.com>2007-02-11 11:35:56 +0000
commit4f562a66247bfdd0168ecab68fbf67619a8a51b0 (patch)
treed8e4f624f21c9ea5672dd1e8b862ecc544763953 /configure
parentf5d28d106e535a8b9413db2afffc175f177811af (diff)
downloadffmpeg-4f562a66247bfdd0168ecab68fbf67619a8a51b0.tar.gz
simplify freetype check
Originally committed as revision 7919 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 2 insertions, 5 deletions
diff --git a/configure b/configure
index 58edcbd33a..1840408d69 100755
--- a/configure
+++ b/configure
@@ -1657,13 +1657,10 @@ fi
freetype2=no
if test "x$targetos" != "xBeOS"; then
- if (freetype-config --version) >/dev/null 2>&1 ; then
+ if freetype-config --version >/dev/null 2>&1; then
temp_cflags `freetype-config --cflags`
temp_extralibs `freetype-config --libs`
- check_ld <<EOF && freetype2=yes
-#include <ft2build.h>
-int main( void ) { return (int) FT_Init_FreeType(0); }
-EOF
+ check_lib ft2build.h FT_Init_FreeType && enable freetype2
restore_flags
fi
fi