summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorsiretart <siretart@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-24 21:13:22 +0000
committersiretart <siretart@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-24 21:13:22 +0000
commit2032889bb5a1d3aa35f9b1b1f39771e14e83fbad (patch)
tree257a10df96293e84a3ea7ed04c715ad2918fd61a /configure
parent30748b8a55914b5947505db2a4364922e6223795 (diff)
downloadmpv-2032889bb5a1d3aa35f9b1b1f39771e14e83fbad.tar.bz2
mpv-2032889bb5a1d3aa35f9b1b1f39771e14e83fbad.tar.xz
support linking to fribidi without pkg-config
reintroduce the logic that was removed with the previous commit. In case the naive approach to link fails, try again with pkg-config. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31210 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure
index a8519c71a8..021708e83d 100755
--- a/configure
+++ b/configure
@@ -6453,9 +6453,15 @@ int main(void) {
}
EOF
_fribidi=no
- _inc_tmp="$($_pkg_config --cflags fribidi)"
- _ld_tmp="$($_pkg_config --libs fribidi)"
+ _inc_tmp=""
+ _ld_tmp="-lfribidi"
cc_check $_inc_tmp $_ld_tmp && _fribidi=yes
+ if $_pkg_config --exists fribidi > /dev/null 2>&1 &&
+ test "$_fribidi" = no ; then
+ _inc_tmp="$($_pkg_config --cflags)"
+ _ld_tmp="$($_pkg_config --libs)"
+ cc_check $_inc_tmp $_ld_tmp && _fribidi=yes
+ fi
fi
if test "$_fribidi" = yes ; then
def_fribidi='#define CONFIG_FRIBIDI 1'