[Mplayer-cvslog] CVS: main Makefile,1.112,1.113 configure,1.313,1.314

[Arpi of Ize]

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

Modified Files:
	Makefile configure 
Log Message:
-ao NAS support by Tobias Diedrich <ranma at gmx.at>

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- Makefile	3 Dec 2001 01:07:52 -0000	1.112
+++ Makefile	3 Dec 2001 01:12:30 -0000	1.113
@@ -34,7 +34,7 @@
 VO_LIBS = -Llibvo2 -lvo2 $(X_LIB) $(DXR3_LIB) $(GGI_LIB) $(MLIB_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB)
 endif
 
-A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)
+A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)
 
 OSDEP_LIBS = -Llinux -losdep
 PP_LIBS = -Lpostproc -lpostproc

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- configure	3 Dec 2001 01:07:52 -0000	1.313
+++ configure	3 Dec 2001 01:12:30 -0000	1.314
@@ -646,6 +646,7 @@
 _dga=auto	# 1 2 no auto
 _xv=auto
 _sdl=auto
+_nas=auto
 _png=auto
 _gl=auto
 _ggi=auto
@@ -714,6 +715,8 @@
   --disable-xv)		_xv=no		;;
   --enable-sdl)		_sdl=yes	;;
   --disable-sdl)	_sdl=no		;;
+  --enable-nas)		_nas=yes	;;
+  --disable-nas)	_nas=no		;;
   --enable-png)		_png=yes	;;
   --disable-png)	_png=no		;;
   --enable-gl)		_gl=yes		;;
@@ -1768,6 +1771,24 @@
 fi
 echores "$_sdl (with $_sdlconfig)"
 
+echocheck "NAS"
+if test "$_nas" = auto || test "$_nas" = yes ; then
+  cat > $TMPC << EOF
+#include <audio/audiolib.h>
+int main(void) { return 0; }
+EOF
+  _nas=no
+  cc_check -laudio -lX11 -lXt -L$_x11libdir && _nas=yes
+fi
+if test "$_nas" = yes ; then
+  _def_nas='#define HAVE_NAS 1'
+  _ld_nas="-laudio -lX11 -lXt -L$_x11libdir"
+  _aosrc="$_aosrc ao_nas.c"
+  _aomodules="nas $_aomodules"
+else
+  _def_nas='#undef HAVE_NAS'
+fi
+echores "$_nas"
 
 echocheck "DXR3/H+"
 if test "$_dxr3" = auto ; then
@@ -2598,6 +2619,7 @@
 
 # audio output
 ALSA_LIB = $_ld_alsa
+NAS_LIB = $_ld_nas
 MAD_LIB = $_ld_mad
 VORBIS_LIB = $_ld_vorbis
 SGIAUDIO_LIB = $_ld_sgiaudio
@@ -2779,6 +2801,8 @@
 $_def_alsa9
 $_def_sunaudio
 $_def_sgiaudio
+$_def_nas
+
 
 /* Enable fast OSD/SUB renderer (looks ugly, but uses less CPU power) */
 #undef FAST_OSD