Mercurial > mplayer.hg
changeset 33924:f00fc114eb87
configure: rewrite fribidi check to be consistent with other pkg-config checks
| author | diego |
|---|---|
| date | Thu, 25 Aug 2011 19:19:53 +0000 |
| parents | f14570733c62 |
| children | 162828e38481 |
| files | configure |
| diffstat | 1 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Aug 25 19:19:51 2011 +0000 +++ b/configure Thu Aug 25 19:19:53 2011 +0000 @@ -6037,8 +6037,6 @@ echocheck "fribidi with charsets" -inc_tmp="" -ld_tmp="" if test "$_fribidi" = auto ; then cat > $TMPC << EOF #include <stdlib.h> @@ -6052,20 +6050,18 @@ } EOF _fribidi=no - inc_tmp="" - ld_tmp="-lfribidi" - cc_check $inc_tmp $ld_tmp && _fribidi=yes + cc_check -lfribidi && _fribidi=yes && extra_ldflags="$extra_ldflags -lfribidi" if $_pkg_config --exists fribidi > /dev/null 2>&1 && test "$_fribidi" = no ; then inc_tmp="$($_pkg_config --cflags fribidi)" ld_tmp="$($_pkg_config --libs fribidi)" - cc_check $inc_tmp $ld_tmp && _fribidi=yes + cc_check $inc_tmp $ld_tmp && _fribidi=yes && + extra_cflags="$extra_cflags $inc_tmp" && + extra_ldflags="$extra_ldflags $ld_tmp" fi fi if test "$_fribidi" = yes ; then def_fribidi='#define CONFIG_FRIBIDI 1' - extra_cflags="$extra_cflags $inc_tmp" - extra_ldflags="$extra_ldflags $ld_tmp" else def_fribidi='#undef CONFIG_FRIBIDI' fi