[Mplayer-cvslog] CVS: main configure,1.340,1.341

[David Holm]

Arpi of Ize wrote:

>Update of /cvsroot/mplayer/main
>In directory mplayer:/var/tmp.root/cvs-serv13695
>
>Modified Files:
>	configure 
>Log Message:
>disable mp1e if no dxr3 or no mmx
>
>Index: configure
>===================================================================
>RCS file: /cvsroot/mplayer/main/configure,v
>retrieving revision 1.340
>retrieving revision 1.341
>diff -u -r1.340 -r1.341
>--- configure	28 Dec 2001 20:24:40 -0000	1.340
>+++ configure	28 Dec 2001 21:07:39 -0000	1.341
>@@ -649,7 +649,7 @@
> # If autodetection is available then the third state is: auto
> _libavcodec=auto
> _libavcodecso=no # changed default to no as it causes problems - atmos
>-_mp1e=yes
>+_mp1e=auto
> _mencoder=auto
> _x11=auto
> _dga=auto	# 1 2 no auto
>@@ -745,6 +745,7 @@
>   --disable-iconv)	_iconv=no	;;
>   --enable-rtc)	        _rtc=yes	;;
>   --disable-rtc)	_rtc=no	        ;;
>+  --enable-mp1e)	_mp1e=yes	;;
>   --disable-mp1e)	_mp1e=no	;;
>   --enable-ossaudio)	_ossaudio=yes	;;
>   --disable-ossaudio)	_ossaudio=no	;;
>@@ -1834,23 +1835,6 @@
> fi
> echores "$_nas"
> 
>-# libmp1e's audio encoder is failing under QNX
>-if test "$_mmx" = no || qnx ; then
>-  _mp1e=no
>-fi
>-if test "$_mp1e" = yes ; then
>-  _def_mp1e='#define USE_MP1E'
>-  _ld_mp1e="-Llibmp1e -lmp1e"
>-  _dep_mp1e='libmp1e/libmp1e.a'
>-else
>-  echocheck "libmp1e"
>-  _mp1e=no
>-  _def_mp1e='#undef USE_MP1E'
>-  _ld_mp1e=""
>-  _dep_mp1e=''
>-  echores "$_mp1e"
>-fi
>-
> echocheck "DXR3/H+"
> if test "$_dxr3" = auto ; then
>   cat > $TMPC << EOF
>@@ -1868,9 +1852,30 @@
>   _aomodules="dxr3 $_aomodules"
> else
>   _def_dxr3='#undef HAVE_DXR3'
>+  if test "$_mp1e" = auto ; then
>+    # we don't need mp1e
>+    _mp1e=no
>+  fi
> fi
> echores "$_dxr3"
> 
>+echocheck "libmp1e"
>+if test "$_mmx" = no ; then
>+  # mp1e REQUIRES mmx!
>+  _mp1e=no
>+fi
>+if test "$_mp1e" != no ; then
>+  _mp1e=yes
>+  _def_mp1e='#define USE_MP1E'
>+  _ld_mp1e="-Llibmp1e -lmp1e"
>+  _dep_mp1e='libmp1e/libmp1e.a'
>+else
>+  _mp1e=no
>+  _def_mp1e='#undef USE_MP1E'
>+  _ld_mp1e=""
>+  _dep_mp1e=''
>+fi
>+echores "$_mp1e"
> 
> #########
> # AUDIO #
>
Very well, although, when I have fixed it so that it compiles on nonx86 
you should consider supporting it in mencoder for tv recording.