summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-01-13 16:36:28 +0100
committerwm4 <wm4@nowhere>2013-01-13 17:32:39 +0100
commita27a494e665a16b55d5a0520c3acc2bdd278e4c8 (patch)
tree5331ed72e96a392f96b655b112549e0768cad414 /configure
parentf064debfb746c9a85eab2072a5e5a957039a7bde (diff)
downloadmpv-a27a494e665a16b55d5a0520c3acc2bdd278e4c8.tar.bz2
mpv-a27a494e665a16b55d5a0520c3acc2bdd278e4c8.tar.xz
configure: change libcaca test to pkg-config
Caca is important.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure13
1 files changed, 1 insertions, 12 deletions
diff --git a/configure b/configure
index 5082e00a59..f6696398c5 100755
--- a/configure
+++ b/configure
@@ -2029,21 +2029,10 @@ echores "$_xf86keysym"
echocheck "CACA"
if test "$_caca" = auto ; then
_caca=no
- if ( caca-config --version ) >> "$TMPLOG" 2>&1 ; then
- cat > $TMPC << EOF
-#include <caca.h>
-#ifdef CACA_API_VERSION_1
- #include <caca0.h>
-#endif
-int main(void) { caca_init(); return 0; }
-EOF
- cc_check $(caca-config --libs) && _caca=yes
- fi
+ pkg_config_add 'caca >= 0.99.beta18' && _caca=yes
fi
if test "$_caca" = yes ; then
def_caca='#define CONFIG_CACA 1'
- extra_cflags="$extra_cflags $(caca-config --cflags)"
- libs_mplayer="$libs_mplayer $(caca-config --libs)"
vomodules="caca $vomodules"
else
def_caca='#undef CONFIG_CACA'