ffmpeg | branch: master | James Almer <[email protected]> | Thu Mar 23 18:41:46 2017 -0300| [d07f2dacb97f7f6b6751795b24e0a2410ebe0a6e] | committer: James Almer
Merge commit '1f821e5ad3f8ebacbbb362668561ad976c392c9e' * commit '1f821e5ad3f8ebacbbb362668561ad976c392c9e': configure: Print warnings after all other output Merged-by: James Almer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d07f2dacb97f7f6b6751795b24e0a2410ebe0a6e --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 487a4d7..c1aeb6e 100755 --- a/configure +++ b/configure @@ -6843,11 +6843,6 @@ echo "#endif /* AVUTIL_AVCONFIG_H */" >> $TMPH cp_if_changed $TMPH libavutil/avconfig.h -if test -n "$WARNINGS"; then - printf "\n%s%s$WARNINGS%s" "$warn_color" "$bold_color" "$reset_color" - enabled fatal_warnings && exit 1 -fi - # generate the lists of enabled components print_enabled_components(){ file=$1 @@ -6865,6 +6860,11 @@ print_enabled_components(){ print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $BSF_LIST print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $PROTOCOL_LIST +if test -n "$WARNINGS"; then + printf "\n%s%s$WARNINGS%s" "$warn_color" "$bold_color" "$reset_color" + enabled fatal_warnings && exit 1 +fi + # build pkg-config files lib_version(){ ====================================================================== diff --cc configure index 487a4d7,745b5b7..c1aeb6e --- a/configure +++ b/configure @@@ -6865,6 -5404,8 +6860,11 @@@ print_enabled_components() print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $BSF_LIST print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $PROTOCOL_LIST -test -n "$WARNINGS" && printf "\n$WARNINGS" ++if test -n "$WARNINGS"; then ++ printf "\n%s%s$WARNINGS%s" "$warn_color" "$bold_color" "$reset_color" ++ enabled fatal_warnings && exit 1 ++fi + # build pkg-config files lib_version(){ _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
