summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 16:06:10 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 16:14:55 +0300
commit2f1a518d4572bdad2cacd8e8bc25df93acffa9b4 (patch)
tree7529956ac00a3789a4aa3310fd6c80518a6773f5 /configure
parent9b68a49d0132bbe08d3a9bf7a19276801ac415aa (diff)
parentd852b590a2aefad3c2050cf2741b4c51af8735ca (diff)
downloadmpv-2f1a518d4572bdad2cacd8e8bc25df93acffa9b4.tar.bz2
mpv-2f1a518d4572bdad2cacd8e8bc25df93acffa9b4.tar.xz
Merge svn changes up to r31211
The merged cache2.c changes are known to have problems. Will merge further fixes to them before merging this to the master branch.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 3 insertions, 8 deletions
diff --git a/configure b/configure
index 61bb787d65..b3b3ac2555 100755
--- a/configure
+++ b/configure
@@ -462,7 +462,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
@@ -681,7 +680,6 @@ _macosx_bundle=auto
_sortsub=yes
_freetypeconfig='freetype-config'
_fribidi=auto
-_fribidiconfig='fribidi-config'
_enca=auto
_inet6=auto
_gethostbyname2=auto
@@ -743,9 +741,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)
;;
@@ -6171,10 +6166,10 @@ EOF
_inc_tmp=""
_ld_tmp="-lfribidi"
cc_check $_inc_tmp $_ld_tmp && _fribidi=yes
- if $_fribidiconfig --version > /dev/null 2>&1 &&
+ if $_pkg_config --exists fribidi > /dev/null 2>&1 &&
test "$_fribidi" = no ; then
- _inc_tmp="$($_fribidiconfig --cflags)"
- _ld_tmp="$($_fribidiconfig --libs)"
+ _inc_tmp="$($_pkg_config --cflags)"
+ _ld_tmp="$($_pkg_config --libs)"
cc_check $_inc_tmp $_ld_tmp && _fribidi=yes
fi
fi