diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-03 01:00:21 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-03 01:00:21 +0000 |
| commit | ec0c6d2a912af5df21b455b12f12408c1e1ae858 (patch) | |
| tree | f1b3d84cfef781c3c8f6174ee822fcec9b82c87a /configure | |
| parent | 2e557e3b28add84c060abfae0b7241897be073eb (diff) | |
| download | mpv-ec0c6d2a912af5df21b455b12f12408c1e1ae858.tar.bz2 mpv-ec0c6d2a912af5df21b455b12f12408c1e1ae858.tar.xz | |
Change fribidi check to also work without fribidi-config.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30175 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 19 |
1 files changed, 12 insertions, 7 deletions
@@ -6218,8 +6218,9 @@ echores "$_ass" echocheck "fribidi with charsets" +_inc_tmp="" +_ld_tmp="" if test "$_fribidi" = auto ; then - if ( $_fribidiconfig --version ) >/dev/null 2>&1 ; then cat > $TMPC << EOF #include <stdio.h> /* workaround for fribidi 0.10.4 and below */ @@ -6234,15 +6235,19 @@ int main(void) { } EOF _fribidi=no - cc_check $($_fribidiconfig --cflags) $($_fribidiconfig --libs) && _fribidi=yes - else - _fribidi=no - fi + _inc_tmp="" + _ld_tmp="-lfribidi" + cc_check $_inc_tmp $_ld_tmp && _fribidi=yes + if test "$_fribidi" = no ; then + _inc_tmp="$($_fribidiconfig --cflags)" + _ld_tmp="$($_fribidiconfig --libs)" + cc_check $_inc_tmp $_ld_tmp && _fribidi=yes + fi fi if test "$_fribidi" = yes ; then def_fribidi='#define CONFIG_FRIBIDI 1' - extra_cflags="$extra_cflags $($_fribidiconfig --cflags)" - extra_ldflags="$extra_ldflags $($_fribidiconfig --libs)" + extra_cflags="$extra_cflags $_inc_tmp" + extra_ldflags="$extra_ldflags $_ld_tmp" else def_fribidi='#undef CONFIG_FRIBIDI' fi |