summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-13 21:40:04 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-13 21:40:04 +0000
commit448c9bbb37da6f20ca9ace198952ba4afb3738c0 (patch)
treec3e5ce6c2dc9edf0890cf7bd66f95c0d670e5677 /configure
parent4cde4f0910cd40299d7ec9b67bcacf28acb71de6 (diff)
downloadmpv-448c9bbb37da6f20ca9ace198952ba4afb3738c0.tar.bz2
mpv-448c9bbb37da6f20ca9ace198952ba4afb3738c0.tar.xz
Make caca detection consistent with the others using *-config, also avoids
an ugly error message when caca-config is not installed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12202 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure b/configure
index 8cda6d4b4e..247712157c 100755
--- a/configure
+++ b/configure
@@ -3313,14 +3313,17 @@ else
fi
echores "$_aa"
+
echocheck "CACA"
if test "$_caca" = auto ; then
+ _caca=no
+ if ( caca-config --version ) >> "$TMPLOG" 2>&1 ; then
cat > $TMPC << EOF
#include <caca.h>
int main(void) { (void) caca_init(); return 0; }
EOF
- _caca=no
cc_check `caca-config --libs` && _caca=yes
+ fi
fi
if test "$_caca" = yes ; then
_def_caca='#define HAVE_CACA 1'