[MPlayer-cvslog] r31210 - trunk/configure

[siretart]

Author: siretart
Date: Mon May 24 23:13:22 2010
New Revision: 31210

Log:
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.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Mon May 24 21:32:17 2010	(r31209)
+++ trunk/configure	Mon May 24 23:13:22 2010	(r31210)
@@ -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'