Mercurial > mplayer.hg
changeset 31152:aee6d64fd1a6
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
| author | siretart |
|---|---|
| date | Mon, 24 May 2010 19:32:17 +0000 |
| parents | 944efc839c41 |
| children | 953dd14839c0 |
| files | configure |
| diffstat | 1 files changed, 2 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon May 24 17:51:15 2010 +0000 +++ b/configure Mon May 24 19:32:17 2010 +0000 @@ -488,7 +488,6 @@ --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 @@ _sortsub=yes _freetypeconfig='freetype-config' _fribidi=auto -_fribidiconfig='fribidi-config' _enca=auto _inet6=auto _gethostbyname2=auto @@ -800,9 +798,6 @@ --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 @@ } 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'