[Mplayer-cvslog] CVS: main configure,1.852,1.853

Diego Biurrun CVS syncmail at mplayerhq.hu
Tue Apr 13 23:40:07 CEST 2004


CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv1293

Modified Files:
	configure 
Log Message:
Make caca detection consistent with the others using *-config, also avoids
an ugly error message when caca-config is not installed.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.852
retrieving revision 1.853
diff -u -r1.852 -r1.853
--- configure	13 Apr 2004 12:19:10 -0000	1.852
+++ configure	13 Apr 2004 21:40:04 -0000	1.853
@@ -3313,14 +3313,17 @@
 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'




More information about the MPlayer-cvslog mailing list