From 30748b8a55914b5947505db2a4364922e6223795 Mon Sep 17 00:00:00 2001
From: siretart <siretart@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 24 May 2010 19:32:17 +0000
Subject: make configure use pkg-config for fribidi checks

fribidi upstream has dropped fribidi-config in favor of pkg-config
now: http://lists.freedesktop.org/archives/fribidi/2008-May/000532.html

This commit fixes:

http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1675
https://launchpad.net/bugs/556200
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582784


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31209 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 6308d11878..a8519c71a8 100755
--- a/configure
+++ b/configure
@@ -488,7 +488,6 @@ Use these options if autodetection fails:
   --with-xvmclib=NAME         adapter-specific library name (e.g. XvMCNVIDIA)
 
   --with-freetype-config=PATH path to freetype-config
-  --with-fribidi-config=PATH  path to fribidi-config
   --with-glib-config=PATH     path to glib*-config
   --with-gtk-config=PATH      path to gtk*-config
   --with-sdl-config=PATH      path to sdl*-config
@@ -740,7 +739,6 @@ _macosx_bundle=auto
 _sortsub=yes
 _freetypeconfig='freetype-config'
 _fribidi=auto
-_fribidiconfig='fribidi-config'
 _enca=auto
 _inet6=auto
 _gethostbyname2=auto
@@ -800,9 +798,6 @@ for ac_option do
   --with-freetype-config=*)
     _freetypeconfig=$(echo $ac_option | cut -d '=' -f 2)
     ;;
-  --with-fribidi-config=*)
-    _fribidiconfig=$(echo $ac_option | cut -d '=' -f 2)
-    ;;
   --with-gtk-config=*)
     _gtkconfig=$(echo $ac_option | cut -d '=' -f 2)
     ;;
@@ -6458,15 +6453,9 @@ int main(void) {
 }
 EOF
     _fribidi=no
-    _inc_tmp=""
-    _ld_tmp="-lfribidi"
+    _inc_tmp="$($_pkg_config --cflags fribidi)"
+    _ld_tmp="$($_pkg_config --libs fribidi)"
     cc_check $_inc_tmp $_ld_tmp && _fribidi=yes
-    if $_fribidiconfig --version > /dev/null 2>&1 &&
-       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'
-- 
cgit v1.2.3


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