Mercurial > mplayer.hg

changeset 31153:953dd14839c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author siretart
date Mon, 24 May 2010 21:13:22 +0000
parents aee6d64fd1a6
children 307aae46ca01
files configure
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Mon May 24 19:32:17 2010 +0000
+++ b/configure	Mon May 24 21:13:22 2010 +0000
@@ -6453,9 +6453,15 @@
 }
 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'