Revision 3dc7174e

View differences:

configure
299 299
    check_lib $header $func "$@" || die "ERROR: $name not found"
300 300
}
301 301

  
302
filter_out(){
303
    pattern="$1"
304
    shift
305
    echo "$@" | sed "s%\\<$pattern\\>%%g"
306
}
307

  
302 308
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
303 309
    show_help
304 310
fi
......
817 823
  ;;
818 824
  --enable-decoder=*) DECODER_LIST="$DECODER_LIST ${optval}_decoder"
819 825
  ;;
820
  --disable-encoder=*) ENCODER_LIST="`echo $ENCODER_LIST | sed -e \"s#${optval}_encoder##\"`"
826
  --disable-encoder=*) ENCODER_LIST="`filter_out ${optval}_encoder $ENCODER_LIST`"
821 827
  ;;
822
  --disable-decoder=*) DECODER_LIST="`echo $DECODER_LIST | sed -e \"s#${optval}_decoder##\"`"
828
  --disable-decoder=*) DECODER_LIST="`filter_out ${optval}_decoder $DECODER_LIST`"
823 829
  ;;
824 830
  --disable-encoders) ENCODER_LIST=""
825 831
  ;;
......
827 833
  ;;
828 834
  --enable-muxer=*) MUXER_LIST="$MUXER_LIST ${optval}_muxer"
829 835
  ;;
830
  --disable-muxer=*) MUXER_LIST="`echo $MUXER_LIST | sed -e \"s#${opt#*=}_muxer##\"`"
836
  --disable-muxer=*) MUXER_LIST="`filter_out ${optval}_muxer $MUXER_LIST`"
831 837
  ;;
832 838
  --disable-muxers) MUXER_LIST=""; ffserver="no"
833 839
  ;;
834 840
  --enable-demuxer=*) DEMUXER_LIST="$DEMUXER_LIST ${optval}_demuxer"
835 841
  ;;
836
  --disable-demuxer=*) DEMUXER_LIST="`echo $DEMUXER_LIST | sed -e \"s#${optval}_demuxer##\"`"
842
  --disable-demuxer=*) DEMUXER_LIST="`filter_out ${optval}_demuxer $DEMUXER_LIST`"
837 843
  ;;
838 844
  --disable-demuxers) DEMUXER_LIST=""
839 845
  ;;
840 846
  --enable-parser=*) PARSER_LIST="$PARSER_LIST ${optval}_parser"
841 847
  ;;
842
  --disable-parser=*) PARSER_LIST="`echo $PARSER_LIST | sed -e \"s#${optval}_parser##\"`"
848
  --disable-parser=*) PARSER_LIST="`filter_out ${optval}_parser $PARSER_LIST`"
843 849
  ;;
844 850
  --disable-parsers) PARSER_LIST=""
845 851
  ;;

Also available in: Unified diff