[Mplayer-cvslog] CVS: main configure,1.60,1.61

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv26137

Modified Files:
	configure 
Log Message:
prefix add to config.h

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** configure	2001/06/04 14:14:28	1.60
--- configure	2001/06/04 18:23:10	1.61
***************
*** 112,115 ****
--- 112,117 ----
  	--enable-lirc	        enable LIRC (remote control) support
  
+ 	--disable-alsa		disable alsa support [autodetect]
+ 
  	--disable-gcc-checking  disable gcc version checking
  
***************
*** 275,278 ****
--- 277,282 ----
  _gui=no;
  
+ _alsa=yes
+ 
  for i in `echo $pparam`; do
  
***************
*** 569,572 ****
--- 573,600 ----
  # ---
  
+ cat > $TMPC << EOF
+ #include <sys/asoundlib.h>
+ #include <soundcard.h>
+ int main( void ) { if(SND_LIB_MAJOR==0&&SND_LIB_MINOR==5)return 1; return 0; }
+ EOF
+ 
+ _alsaver='not found'
+ $_cc -o $TMPO -lasound $TMPC &> /dev/null || _alsa=no
+ [ $_alsa == "yes" ] && $TMPO && { _alsaver='0.5.x'; }
+ 
+ if [ $_alsaver == 'not found' ]; then
+ cat > $TMPC << EOF
+ #include <sys/asoundlib.h>
+ #include <soundcard.h>
+ int main( void ) { if(SND_LIB_MAJOR==0&&SND_LIB_MINOR==9)return 1; return 0; }
+ EOF
+ 
+ _alsaver='not found'
+ $_cc -o $TMPO -lasound $TMPC &> /dev/null || _alsa=no
+ [ $_alsa == "yes" ] && $TMPO && { _alsaver='0.9.x'; }
+ fi
+ 
+ # ---
+ 
  # check for the parameters.
  
***************
*** 738,741 ****
--- 766,773 ----
    	_gui=no
  	;;
+   --disable-alsa)
+ 	_alsaver='not found'
+         _alsa=no
+ 	;;
    --with-win32libdir=*)
          _win32libdir=`echo $ac_option | cut -d '=' -f 2`
***************
*** 848,851 ****
--- 880,884 ----
  echo "Checking for DirectShow ... $_dshow"
  echo "Checking for fastmemcpy ... $_fastmemcpy"
+ echo "Checking for alsa ... $_alsaver"
  # write conf files.
  
***************
*** 1133,1136 ****
--- 1166,1174 ----
  fi
  
+ if [ $_alsaver != 'not found' ]; then
+  [ $_alsaver == '0.5.x' ] && { _aosrc="$_aosrc ao_alsa5.c"; } 
+ # [ $_alsaver == '0.9.x' ] && { _aosrc="$_aosrc ao_alsa9.c"; }
+ fi
+ 
  cat > $CCONF << EOF
  
***************
*** 1199,1202 ****
--- 1237,1241 ----
  /* gui support, please do not edit this option */
  $_gui
+ #define PREFIX "$_prefix"
  
  /* Enable fast OSD/SUB renderer (looks ugly, but uses less CPU power) */


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog