CVS: main configure,1.70,1.71

5 Jun 2001

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

Modified Files:
	configure 
Log Message:
add and disable esd detection support ;)

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** configure	2001/06/05 08:12:00	1.70
--- configure	2001/06/05 10:16:32	1.71
***************
*** 7,10 ****
--- 7,12 ----
  # Changes in reversed order:
  #
+ # 2001/06/05 by Pontscho
+ # - added alsa and esd detection
  #
  # 2001/06/05 by Nick Kurshev
***************
*** 116,121 ****
  	--enable-lirc	        enable LIRC (remote control) support

! 	--disable-alsa		disable alsa support [autodetect]
! 
  	--disable-gcc-checking  disable gcc version checking

--- 118,124 ----
  	--enable-lirc	        enable LIRC (remote control) support

!         --disable-alsa          disable alsa support [autodetect]
! 	--disable-esd           disable esd sound support [autodetect]
! 		
  	--disable-gcc-checking  disable gcc version checking

***************
*** 293,296 ****
--- 296,300 ----

  _alsa=yes
+ _esd=yes

  for i in `echo $pparam`; do
***************
*** 597,623 ****
  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='notfound'
- $_cc -o $TMPO -lasound $TMPC &> /dev/null || _alsa=no

! [ $_alsa == "yes" ] && $TMPO && { _alsaver='0.5.x'; }

! if [ $_alsaver = 'notfound' ]; 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='notfound'
! $_cc -o $TMPO -lasound $TMPC &> /dev/null || _alsa=no
! [ $_alsa == "yes" ] && $TMPO && { _alsaver='0.9.x'; }
  fi

  # ---

  # check for the parameters.

--- 601,635 ----
  cat > $TMPC << EOF
  #include <sys/asoundlib.h>
! #include <sys/soundcard.h>
! int main( void ) { if(SND_LIB_MAJOR==0&&SND_LIB_MINOR==5)return 0; return 1; }
  EOF

! _alsaver='not found'
! $_cc -o $TMPO -lasound $TMPC 2> /dev/null || _alsa=no
! [ $_alsa == 'yes' ] && $TMPO && { _alsaver='0.5.x'; }

! if [ $_alsaver == 'not found' ]; then
  cat > $TMPC << EOF
  #include <sys/asoundlib.h>
! #include <sys/soundcard.h>
! int main( void ) { if(SND_LIB_MAJOR==0&&SND_LIB_MINOR==9)return 0; return 1; }
  EOF

! _alsaver='not found'
! $_cc -o $TMPO -lasound $TMPC 2> /dev/null || _alsa=no
! [ $_alsa == 'yes' ] && $TMPO && { _alsaver='0.9.x'; }
  fi

  # ---

+ cat > $TMPC << EOF
+ #include <esd.h>
+ int main( void ){ return 0; }
+ EOF
+ 
+ $_cc -o $TMPO -lesd $TMPC 2> /dev/null || { _esd=no; }
+ 
+ # ---
+ 
  # check for the parameters.

***************
*** 793,796 ****
--- 805,811 ----
          _alsa=no
  	;;
+   --disable-esd)
+         _esd=no
+         ;;
    --with-win32libdir=*)
          _win32libdir=`echo $ac_option | cut -d '=' -f 2`
***************
*** 937,940 ****
--- 952,956 ----
  echo "Checking for fastmemcpy ... $_fastmemcpy"
  echo "Checking for alsa ... $_alsaver"
+ echo "Checking for esd ... $_esd"
  # write conf files.

***************
*** 1222,1232 ****
  fi

! if [ "$_alsaver" != "notfound" ]; then
! [ $_alsaver == '0.5.x' ] && { _aosrc="$_aosrc ao_alsa5.c"; $_alsa='#define HAVE_ALSA5'; } 
! # [ $_alsaver == '0.9.x' ] && { _aosrc="$_aosrc ao_alsa9.c"; }
! else
!  _alsa=' '
  fi
! 
  cat > $CCONF << EOF

--- 1238,1253 ----
  fi

! _alsa5='#undef HAVE_ALSA5'
! _alsa9='#undef HAVE_ALSA9'
! if [ $_alsa == 'yes' ]; then
!  [ $_alsaver == '0.5.x' ] && { _aosrc="$_aosrc ao_alsa5.c"; _alsa5='#define HAVE_ALSA5'; }
!  # [ $_alsaver == '0.9.x' ] && { _aosrc="$_aosrc ao_alsa9.c"; _alsa9='#define HAVE_ALSA9'; }
! fi
!   
! _esdd='#undef HAVE_ESD'
! if [ $_esd == 'yes' ]; then
!  _esdd='#undef HAVE_ESD'
  fi
!    
  cat > $CCONF << EOF

***************
*** 1297,1302 ****
  #define PREFIX "$_prefix"

! /* ALSA support */
! $_alsa

  /* Enable fast OSD/SUB renderer (looks ugly, but uses less CPU power) */
--- 1318,1325 ----
  #define PREFIX "$_prefix"

! /* Audio lib drivers */
! $_alsa5
! $_alsa9
! $_esdd

  /* Enable fast OSD/SUB renderer (looks ugly, but uses less CPU power) */

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

Zoltan Ponekker

tags

participants (1)