From 2032889bb5a1d3aa35f9b1b1f39771e14e83fbad Mon Sep 17 00:00:00 2001
From: siretart <siretart@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 24 May 2010 21:13:22 +0000
Subject: 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
---
 configure | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'configure')

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'
-- 
cgit v1.2.3