[Mplayer-cvslog] CVS: main configure,1.614,1.615

[Rémi Guyomarch CVS]

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

Modified Files:
	configure 
Log Message:

Add Tremor (an integer-only Vorbis decoder) support.



Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.614
retrieving revision 1.615
diff -u -r1.614 -r1.615
--- configure	26 Nov 2002 22:55:32 -0000	1.614
+++ configure	4 Dec 2002 20:27:21 -0000	1.615
@@ -170,6 +170,7 @@
   --disable-libavcodec   disable libavcodec [autodetect]
   --enable-libfame       enable libfame realtime encoder [autodetect]
   --enable-vorbis        build with OggVorbis support [autodetect]
+  --enable-tremor        build with integer-only OggVorbis support [disabled]
   --enable-faad          build with FAAD2 (MP4/AAC) support [autodetect]
   --disable-libdv        disable libdv 0.9.5 en/decoding support [autodetect]
   --disable-mad          disable libmad (mpeg audio) support [autodetect]
@@ -964,6 +965,7 @@
 _liblzo=auto
 _mad=auto
 _vorbis=auto
+_tremor=no
 _faad=auto
 _css=auto
 _dvdnav=yes
@@ -1099,6 +1101,8 @@
   --disable-liblzo)	_liblzo=no		;;
   --enable-vorbis)	_vorbis=yes	;;
   --disable-vorbis)	_vorbis=no	;;
+  --enable-tremor)	_tremor=yes	;;
+  --disable-tremor)	_tremor=no	;;
   --enable-faad)	_faad=yes	;;
   --disable-faad)	_faad=no	;;
   --enable-css)		_css=yes	;;
@@ -3580,10 +3584,17 @@
 fi
 if test "$_vorbis" = yes ; then
   _def_vorbis='#define HAVE_OGGVORBIS 1'
-  _ld_vorbis='-lvorbis -logg'
+  if test "$_tremor" = yes ; then
+    _def_tremor='#define TREMOR 1'
+    _ld_vorbis='-lvorbisidec -logg'
+  else
+    _def_tremor='#undef TREMOR'
+    _ld_vorbis='-lvorbis -logg'
+  fi
   _codecmodules="libvorbis $_codecmodules"
 else
   _def_vorbis='#undef HAVE_OGGVORBIS'
+  _def_tremor='#undef TREMOR'
   _nocodecmodules="libvorbis $_nocodecmodules"
 fi
 echores "$_vorbis"
@@ -5019,6 +5030,9 @@
 
 /* enable OggVorbis support */
 $_def_vorbis
+
+/* enable Tremor as vorbis decoder */
+$_def_tremor
 
 /* enable FAAD (AAC) support */
 $_def_faad