From fa5ab5c2571cdef6d238880b50e8b26f2b101651 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 13 Dec 2006 10:59:14 +0000 Subject: [PATCH] Ugly hotfix for --disable-mencoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21607 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b71a8b525f..7ecfaf3f6b 100755 --- a/configure +++ b/configure @@ -1592,9 +1592,11 @@ _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 _libavcodec_so=auto _libavformat=auto _libavformat_so=auto @@ -7871,13 +7873,26 @@ $_def_amr_wb `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 $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define ENABLE_/;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/'` -`echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define ENABLE_/;s/$/ 1/'` +`for part in $_libavencoders_all; do + if \` echo $_libavencoders | grep $part > /dev/null \`; then + echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 1/' + else + echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 0/' + fi + done` +`for part in $_libavmuxers_all; do + if \` echo $_libavmuxers | grep $part \`; then + echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 1/' + else + echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 0/' + fi + done` + $_def_lavc_faac $_def_lavc_xvid $_def_lavc_mp3lame