[Mplayer-cvslog] CVS: main configure,1.55,1.56 configure.FreeBSD,1.1,1.2

[Felix Buenemann]

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

Modified Files:
	configure configure.FreeBSD 
Log Message:
Updates for sdl audio out.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** configure	2001/06/03 00:31:41	1.55
--- configure	2001/06/03 10:46:42	1.56
***************
*** 935,938 ****
--- 935,939 ----
  
  _vosrc=''
+ _aosrc=''
  
  if [ $_png = yes ]; then
***************
*** 963,966 ****
--- 964,968 ----
   _sdldef='#define HAVE_SDL'
   _vosrc=$_vosrc' vo_sdl.c'
+  _aosrc=$_aosrc' ao_sdl.c'
  else
   _sdldef='#undef HAVE_SDL'
***************
*** 1190,1193 ****
--- 1192,1208 ----
  EOF
  
+ echo "Creating libao2/config.mak"
+ 
+ _aoobj=`echo $_aosrc | sed -e 's/\.c/\.o/g'`
+ 
+ cat > libao2/config.mak << EOF
+ 
+ include ../config.mak
+ 
+ OPTIONAL_SRCS=$_aosrc
+ OPTIONAL_OBJS=$_aoobj
+ 
+ EOF
+ 
  echo "Creating libac3/config.mak"
  
***************
*** 1271,1277 ****
   echo "You have libSDL installed, but your version is outdated (earlier then"
   echo "v.1.1.7), SDL support has been disabled please update, if you want to"
!  echo "use it (libSDL v1.1.8 and v1.2.0 are tested and known to work, recent"
   echo "versions are available from http://www.libsdl.org/)."
   echo "After updating you need to re-run ./configure and recompile to enable SDL."
   echo
  fi
--- 1286,1294 ----
   echo "You have libSDL installed, but your version is outdated (earlier then"
   echo "v.1.1.7), SDL support has been disabled please update, if you want to"
!  echo "use it (libSDL v1.1.8 and v1.2.0/1 are tested and known to work, recent"
   echo "versions are available from http://www.libsdl.org/)."
   echo "After updating you need to re-run ./configure and recompile to enable SDL."
+  echo "(If you only want to use SDLlib audio driver older versions might work, you"
+  echo "can use --enable-sdl to force using SDLlib)"
   echo
  fi

Index: configure.FreeBSD
===================================================================
RCS file: /cvsroot/mplayer/main/configure.FreeBSD,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** configure.FreeBSD	2001/06/03 00:31:41	1.1
--- configure.FreeBSD	2001/06/03 10:46:42	1.2
***************
*** 935,938 ****
--- 935,939 ----
  
  _vosrc=''
+ _aosrc=''
  
  if [ $_png = yes ]; then
***************
*** 963,966 ****
--- 964,968 ----
   _sdldef='#define HAVE_SDL'
   _vosrc=$_vosrc' vo_sdl.c'
+  _aosrc=$_aosrc' ao_sdl.c'
  else
   _sdldef='#undef HAVE_SDL'
***************
*** 1186,1189 ****
--- 1188,1204 ----
  EOF
  
+ echo "Creating libao2/config.mak"
+ 
+ _aoobj=`echo $_aosrc | sed -e 's/\.c/\.o/g'`
+ 
+ cat > libao2/config.mak << EOF
+ 
+ include ../config.mak
+ 
+ OPTIONAL_SRCS=$_aosrc
+ OPTIONAL_OBJS=$_aoobj
+ 
+ EOF
+ 
  echo "Creating libac3/config.mak"
  
***************
*** 1267,1273 ****
   echo "You have libSDL installed, but your version is outdated (earlier then"
   echo "v.1.1.7), SDL support has been disabled please update, if you want to"
!  echo "use it (libSDL v1.1.8 and v1.2.0 are tested and known to work, recent"
   echo "versions are available from http://www.libsdl.org/)."
   echo "After updating you need to re-run ./configure and recompile to enable SDL."
   echo
  fi
--- 1282,1290 ----
   echo "You have libSDL installed, but your version is outdated (earlier then"
   echo "v.1.1.7), SDL support has been disabled please update, if you want to"
!  echo "use it (libSDL v1.1.8 and v1.2.0/1 are tested and known to work, recent"
   echo "versions are available from http://www.libsdl.org/)."
   echo "After updating you need to re-run ./configure and recompile to enable SDL."
+  echo "(If you only want to use SDLlib audio driver older versions might work, you"
+  echo "can use --enable-sdl to force using SDLlib)"
   echo
  fi


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