RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-14 19:05:33 +00:00
Code Issues Releases Wiki Activity

Extended/reworked fontconfig test to work without pkg-config with versions

Browse Source 
that need -lz


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20663 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-11-04 11:57:03 +00:00
parent 3a0f1fa219
commit ee1ee5aa19
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure vendored
View File

@ -5403,16 +5403,16 @@ int main()
}
EOF
_fontconfig=yes
if cc_check -lfontconfig ; then
_ld_fontconfig="-lfontconfig"
elif cc_check -lfontconfig -lexpat -lfreetype ; then
_ld_fontconfig="-lfontconfig -lexpat -lfreetype"
elif cc_check `$_pkg_config --silence-errors --cflags --libs fontconfig` ; then
_inc_extra="$_inc_extra `$_pkg_config --cflags fontconfig`"
_ld_fontconfig=`$_pkg_config --libs fontconfig`
else
_fontconfig=no
_fontconfig=no
for _ld_tmp in "" "-lexpat -lfreetype" "-lexpat -lfreetype -lz" ; do
_ld_tmp="-lfontconfig $_ld_tmp"
cc_check $_ld_tmp && _fontconfig=yes && _ld_fontconfig="$_ld_tmp" && break
done
if test "$_fontconfig" = no && $_pkg_config --exists fontconfig ; then
_inc_tmp=`$_pkg_config --cflags fontconfig`
_ld_tmp=`$_pkg_config --libs fontconfig`
cc_check $_inc_tmp $_ld_tmp && _fontconfig=yes \
&& _ld_fontconfig="$_ld_tmp" && _inc_extra="$_inc_extra $_inc_tmp"
fi
fi
if test "$_fontconfig" = yes ; then