[Mplayer-cvslog] CVS: main configure,1.77,1.78

[GEREOFFY]

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

Modified Files:
	configure 
Log Message:
fixed --disable-as-checking, added --enable-streaming

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -r1.77 -r1.78
*** configure	2001/06/06 21:16:21	1.77
--- configure	2001/06/08 23:30:09	1.78
***************
*** 309,312 ****
--- 309,313 ----
  _dshow=yes
  _fastmemcpy=yes
+ _streaming=no
  
  _x=1
***************
*** 574,580 ****
  # ----------- Check X11 and related libs (GL, Xxf86vm, Xv, DGA) --------------
  
! # for Solaris:
  _socklib=
! $_cc $TMPC -o $TMPO -lsocket >/dev/null 2>&1 && _socklib=-lsocket
  
  if [ $_x11 = auto ]; then
--- 575,582 ----
  # ----------- Check X11 and related libs (GL, Xxf86vm, Xv, DGA) --------------
  
! # for Solaris (socket stuff is in -lsocket, gethostbyname and friends in -lnsl):
  _socklib=
! $_cc $TMPC -o $TMPO $_socklib -lsocket >/dev/null 2>&1 && _socklib="$_socklib -lsocket"
! $_cc $TMPC -o $TMPO $_socklib -lnsl >/dev/null 2>&1 && _socklib="$_socklib -lnsl"
  
  if [ $_x11 = auto ]; then
***************
*** 633,636 ****
--- 635,647 ----
  cat > $TMPC << EOF
  #include <sys/soundcard.h>
+ int main( void ) { return 0; }
+ EOF
+ 
+ _sys_soundcard_h=no
+ $_cc -o $TMPO $TMPC 2> /dev/null && _sys_soundcard_h=yes
+ 
+ 
+ cat > $TMPC << EOF
+ #include <sys/soundcard.h>
  int main( void ) {  int arg = SNDCTL_DSP_SETFRAGMENT; }
  EOF
***************
*** 641,644 ****
--- 652,656 ----
  
  cat > $TMPC << EOF
+ #include <sys/types.h>
  #include <sys/audioio.h>
  int main( void ) {  audio_info_t info; AUDIO_INITINFO(&info); }
***************
*** 785,788 ****
--- 797,803 ----
    	_gui=yes
  	;;
+   --enable-streaming)
+   	_streaming=yes
+ 	;;
    --disable-css)
  	_css=no
***************
*** 964,968 ****
    echo "failed"
    echo "Please upgrade(downgrade) binutils to "$_pref_as_version"..."
!   exit
  fi
  
--- 979,987 ----
    echo "failed"
    echo "Please upgrade(downgrade) binutils to "$_pref_as_version"..."
!   if [ $_skip_as_check = 'no' ]; then
!     exit
!   else
!     echo "YOU'VE SELECTED '--disable-as-checking'. PLEASE DON'T SEND US ANY BUGREPORTS!"
!   fi
  fi
  
***************
*** 1027,1030 ****
--- 1046,1055 ----
  # write conf files.
  
+ _streamingdef='#undef STREAMING'
+ if [ $_streaming = yes ]; then
+    _streamingsrcs='asf_streaming.c network.c url.c http.c'
+    _streamingdef='#define STREAMING'
+ fi
+ 
  if [ $_gl = yes ]; then
     _gllib='-lGL'
***************
*** 1151,1154 ****
--- 1176,1186 ----
  fi
  
+ if [ "$_sys_soundcard_h" = "yes" ]; then
+  _have_soundcard_h='#define HAVE_SYS_SOUNDCARD_H 1'
+ else
+  _have_soundcard_h='#undef  HAVE_SYS_SOUNDCARD_H'
+ fi
+ 
+ 
  # Checking for CFLAGS
  if [ "$_profile" != "" ] || [ "$_debug" != "" ]; then
***************
*** 1186,1189 ****
--- 1218,1222 ----
  prefix = $_prefix
  ARCH_LIBS = -ldl -lpthread
+ STREAM_SRCS = $_streamingsrcs
  
  EOF
***************
*** 1378,1384 ****
  $_mpg123
  
- /* AUDIO Support */
- $_ossaudio
- $_sunaudio
  
  /* XMMP support: (test code) */
--- 1411,1414 ----
***************
*** 1399,1402 ****
--- 1429,1436 ----
  #endif
  
+ /* Define this if your system has the header file for the OSS sound interface */
+ $_have_soundcard_h
+ 
+ 
  /* LIRC (remote control, see www.lirc.org) support: */
  $_lircdefs
***************
*** 1419,1425 ****
--- 1453,1461 ----
  
  /* Audio lib drivers */
+ $_ossaudio
  $_alsa5
  $_alsa9
  $_esdd
+ $_sunaudio
  
  /* Enable fast OSD/SUB renderer (looks ugly, but uses less CPU power) */
***************
*** 1446,1450 ****
--- 1482,1489 ----
  /* termcap flag for getch2.c */
  $_termcap
+ 
  $_png
+ 
+ $_streamingdef
  
  /* Extension defines */


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