Mercurial > mplayer.hg
changeset 20647:5412b5d248e6
Extended/reworked fontconfig test to work without pkg-config with versions
that need -lz
| author | reimar |
|---|---|
| date | Sat, 04 Nov 2006 11:57:03 +0000 |
| parents | ab2a5307c029 |
| children | 8db84afbc1c8 |
| files | configure |
| diffstat | 1 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Nov 04 10:21:52 2006 +0000 +++ b/configure Sat Nov 04 11:57:03 2006 +0000 @@ -5403,16 +5403,16 @@ } 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