[MPlayer-cvslog] r31209 - trunk/configure

[siretart]

Author: siretart
Date: Mon May 24 21:32:17 2010
New Revision: 31209

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

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Mon May 24 19:51:15 2010	(r31208)
+++ trunk/configure	Mon May 24 21:32:17 2010	(r31209)
@@ -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'