[Mplayer-cvslog] CVS: main Makefile,1.188,1.189 configure,1.482,1.483

[Atmosfear]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv7217

Modified Files:
	Makefile configure 
Log Message:
aRts audio out support by Michele Balistreri <brain at email.it>


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- Makefile	20 May 2002 23:27:01 -0000	1.188
+++ Makefile	28 May 2002 01:52:32 -0000	1.189
@@ -42,7 +42,7 @@
 V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
 
 AO_LIBS = -Llibao2 -lao2
-A_LIBS = $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(SGIAUDIO_LIB)
+A_LIBS = $(ALSA_LIB) $(ARTS_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(SGIAUDIO_LIB)
 
 CODEC_LIBS = -Llibmpcodecs -lmpcodecs -Lmp3lib -lMP3 -Lliba52 -la52 -Llibmpeg2 -lmpeg2 $(AV_LIB) $(FAME_LIB)
 COMMON_LIBS = $(CODEC_LIBS) -Llibmpdemux -lmpdemux  $(NEW_INPUT_LIB)  $(LIB_LOADER) $(A_LIBS) $(CSS_LIB) $(ARCH_LIB) -Lpostproc -lpostproc $(DECORE_LIB) -Llinux -losdep $(TERMCAP_LIB)  $(STREAMING_LIB) $(Z_LIB) $(GTK_LIBS) $(PNG_LIB) $(JPEG_LIB) $(GIF_LIB) -lm

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- configure	26 May 2002 22:18:59 -0000	1.482
+++ configure	28 May 2002 01:52:32 -0000	1.483
@@ -185,6 +185,7 @@
 
 Audio:
   --disable-ossaudio     disable OSS sound support [autodetect]
+  --disable-arts         disable aRts sound support [autodetect]
   --disable-alsa         disable alsa sound support [autodetect]
   --disable-sunaudio     disable Sun sound support [autodetect]
   --disable-mad          disable mad audio support [autodetect]
@@ -838,6 +839,7 @@
 _iconv=auto
 _rtc=auto
 _ossaudio=auto
+_arts=auto
 _mad=auto
 _vorbis=auto
 _faad=auto
@@ -948,6 +950,8 @@
   --disable-libdv)	_libdv=no	;;
   --enable-ossaudio)	_ossaudio=yes	;;
   --disable-ossaudio)	_ossaudio=no	;;
+  --enable-arts)	_arts=yes	;;
+  --disable-arts)	_arts=no	;;
   --enable-mad)		_mad=yes	;;
   --disable-mad)	_mad=no		;;
   --enable-vorbis)	_vorbis=yes	;;
@@ -2672,6 +2676,24 @@
 echores "$_ossaudio"
 
 
+echocheck "aRts"
+if test "$_arts" = auto ; then
+  _arts=no
+  if ( artsc-config --version >> /dev/null ) ; then
+  _arts=yes
+  fi
+fi
+
+if test "$_arts" = yes ; then
+  _def_arts='#define USE_ARTS 1'
+  _aosrc="$_aosrc ao_arts.c"
+  _aomodules="arts $_aomodules"
+  _ld_arts=`artsc-config --libs`
+  _inc_arts=`artsc-config --cflags`
+fi
+echores "$_arts"
+
+
 echocheck "ALSA audio"
 if test "$_alsa" != no ; then
   _alsa=no
@@ -3808,6 +3830,8 @@
 ALSA_LIB = $_ld_alsa
 NAS_LIB = $_ld_nas
 MAD_LIB = $_ld_mad
+ARTS_LIB = $_ld_arts
+ARTS_INC = $_inc_arts
 VORBIS_LIB = $_ld_vorbis
 FAAD_LIB = $_ld_faad
 SGIAUDIO_LIB = $_ld_sgiaudio
@@ -4066,6 +4090,7 @@
 $_def_ossaudio_devmixer
 $_def_alsa5
 $_def_alsa9
+$_def_arts
 $_def_sys_asoundlib_h
 $_def_alsa_asoundlib_h
 $_def_sunaudio