[MPlayer-cvslog] r21607 - trunk/configure

[Nicolas Baradakis]

> Author: diego
> Date: Wed Dec 13 11:59:14 2006
> New Revision: 21607
>
> Modified:
>    trunk/configure
>
> Log:
> Ugly hotfix for --disable-mencoder.

The patch indeed fix the problems with encoders and muxers. However,
I note there's exactly the same problem with decoders and demuxers.

For example a "./configure --disable-demuxer=mov && make" will fail to
compile properly because ENABLE_MOV_DEMUXER is undeclared.

Please consider the following patch. It's similar to the previous one
but it handles all the FFmpeg components in the same way.

Index: configure
===================================================================
--- configure	(revision 21623)
+++ configure	(working copy)
@@ -1590,13 +1590,16 @@
 _amr_nb=auto
 _amr_nb_fixed=auto
 _amr_wb=auto
-_libavdecoders=`sed -n 's/^[^#]*DEC.*, *\(.*\)).*/\1_decoder/p' "libavcodec/allcodecs.c"`
-_libavencoders=`sed -n 's/^[^#]*ENC.*, *\(.*\)).*/\1_encoder/p' "libavcodec/allcodecs.c"`
-_libavencoders_all=$_libavencoders
-_libavparsers=`sed -n 's/^[^#]*PARSER.*, *\(.*\)).*/\1_parser/p' "libavcodec/allcodecs.c"`
-_libavdemuxers=`sed -n 's/^[^#]*DEMUX.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c`
-_libavmuxers=`sed -n 's/^[^#]*_MUX.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c`
-_libavmuxers_all=$_libavmuxers
+_libavdecoders_all=`sed -n 's/^[^#]*DEC.*, *\(.*\)).*/\1_decoder/p' "libavcodec/allcodecs.c"`
+_libavdecoders=$_libavdecoders_all
+_libavencoders_all=`sed -n 's/^[^#]*ENC.*, *\(.*\)).*/\1_encoder/p' "libavcodec/allcodecs.c"`
+_libavencoders=$_libavencoders_all
+_libavparsers_all=`sed -n 's/^[^#]*PARSER.*, *\(.*\)).*/\1_parser/p' "libavcodec/allcodecs.c"`
+_libavparsers=$_libavparsers_all
+_libavdemuxers_all=`sed -n 's/^[^#]*DEMUX.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c`
+_libavdemuxers=$_libavdemuxers_all
+_libavmuxers_all=`sed -n 's/^[^#]*_MUX.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c`
+_libavmuxers=$_libavmuxers_all
 _libavcodec_so=auto
 _libavformat=auto
 _libavformat_so=auto
@@ -7883,26 +7886,49 @@
 $_def_amr_wb
 
 /* Use specific parts from FFmpeg. */
-`echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'`
-`echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define ENABLE_/;s/$/ 1/'`
-`echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'`
-`echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'`
-`echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define ENABLE_/;s/$/ 1/'`
-`echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'`
-`echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define ENABLE_/;s/$/ 1/'`
-`echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'`
+`for part in $_libavdecoders_all; do
+   ucname=\` echo $part | tr '[a-z]' '[A-Z]' \`
+   if \` echo $_libavdecoders | grep $part > /dev/null \`; then
+     echo "#define CONFIG_$ucname 1"
+     echo "#define ENABLE_$ucname 1"
+   else
+     echo "#define ENABLE_$ucname 0"
+   fi
+ done`
 `for part in $_libavencoders_all; do
+   ucname=\` echo $part | tr '[a-z]' '[A-Z]' \`
    if \` echo $_libavencoders | grep $part > /dev/null \`; then
-     echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 1/'
+     echo "#define CONFIG_$ucname 1"
+     echo "#define ENABLE_$ucname 1"
    else
-     echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 0/'
+     echo "#define ENABLE_$ucname 0"
    fi
  done`
+`for part in $_libavparsers_all; do
+   ucname=\` echo $part | tr '[a-z]' '[A-Z]' \`
+   if \` echo $_libavparsers | grep $part > /dev/null \`; then
+     echo "#define CONFIG_$ucname 1"
+     echo "#define ENABLE_$ucname 1"
+   else
+     echo "#define ENABLE_$ucname 0"
+   fi
+ done`
+`for part in $_libavdemuxers_all; do
+   ucname=\` echo $part | tr '[a-z]' '[A-Z]' \`
+   if \` echo $_libavdemuxers | grep $part > /dev/null \`; then
+     echo "#define CONFIG_$ucname 1"
+     echo "#define ENABLE_$ucname 1"
+   else
+     echo "#define ENABLE_$ucname 0"
+   fi
+ done`
 `for part in $_libavmuxers_all; do
+   ucname=\` echo $part | tr '[a-z]' '[A-Z]' \`
    if \` echo $_libavmuxers | grep $part > /dev/null \`; then
-     echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 1/'
+     echo "#define CONFIG_$ucname 1"
+     echo "#define ENABLE_$ucname 1"
    else
-     echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 0/'
+     echo "#define ENABLE_$ucname 0"
    fi
  done`
 // HACK: disable x11 demuxer for now


-- 
Nicolas Baradakis