ffmpeg | branch: master | Clément Bœsch <[email protected]> | Fri Mar 31 10:22:32 2017 +0200| [b6c293d5e609a7b651c47d3de4749840ae00492e] | committer: Clément Bœsch
Merge commit '59d2b00d201935c16408a2917957d89a170fe58f' * commit '59d2b00d201935c16408a2917957d89a170fe58f': configure: Add --quiet command line parameter to suppress informative output The license assignment is moved out of the quiet condition to make sure it ends up in config.h Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6c293d5e609a7b651c47d3de4749840ae00492e --- configure | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/configure b/configure index aff6ca4..c9bd799 100755 --- a/configure +++ b/configure @@ -63,6 +63,7 @@ Options: [defaults in brackets after descriptions] Help options: --help print this message + --quiet Suppress showing informative output --list-decoders show all available decoders --list-encoders show all available encoders --list-hwaccels show all available hardware accelerators @@ -1417,7 +1418,7 @@ EOF } cp_if_changed(){ - cmp -s "$1" "$2" && echo "$2 is unchanged" && return + cmp -s "$1" "$2" && { test "$quiet" != "yes" && echo "$2 is unchanged"; } && return mkdir -p "$(dirname $2)" $cp_f "$1" "$2" } @@ -3509,6 +3510,8 @@ for opt do ;; --help|-h) show_help ;; + --quiet|-q) quiet=yes + ;; --fatal-warnings) enable fatal_warnings ;; *) @@ -6504,6 +6507,19 @@ postproc_deps="$(filter_out 'gpl' $postproc_deps)" map 'expand_deps $v' $LIBRARY_LIST +license="LGPL version 2.1 or later" +if enabled nonfree; then + license="nonfree and unredistributable" +elif enabled gplv3; then + license="GPL version 3 or later" +elif enabled lgplv3; then + license="LGPL version 3 or later" +elif enabled gpl; then + license="GPL version 2 or later" +fi + +if test "$quiet" != "yes"; then + echo "install prefix $prefix" echo "source path $source_path" echo "C compiler $cc" @@ -6614,21 +6630,12 @@ for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf ind echo done -license="LGPL version 2.1 or later" -if enabled nonfree; then - license="nonfree and unredistributable" -elif enabled gplv3; then - license="GPL version 3 or later" -elif enabled lgplv3; then - license="LGPL version 3 or later" -elif enabled gpl; then - license="GPL version 2 or later" -fi - echo "License: $license" echo "Creating config.mak, config.h, and doc/config.texi..." +fi # test "$quiet" != "yes" + test -e Makefile || echo "include $source_path/Makefile" > Makefile enabled stripping || strip="echo skipping strip" ====================================================================== diff --cc configure index aff6ca4,e862757..c9bd799 --- a/configure +++ b/configure @@@ -1416,8 -1161,14 +1417,8 @@@ check_host_cpp_condition() EOF } -apply(){ - file=$1 - shift - "$@" < "$file" > "$file.tmp" && mv "$file.tmp" "$file" || rm "$file.tmp" -} - cp_if_changed(){ - cmp -s "$1" "$2" && echo "$2 is unchanged" && return + cmp -s "$1" "$2" && { test "$quiet" != "yes" && echo "$2 is unchanged"; } && return mkdir -p "$(dirname $2)" $cp_f "$1" "$2" } @@@ -3509,8 -2741,8 +3510,10 @@@ for opt d ;; --help|-h) show_help ;; + --quiet|-q) quiet=yes + ;; + --fatal-warnings) enable fatal_warnings + ;; *) optname="${opt%%=*}" optname="${optname#--}" @@@ -6499,11 -5113,10 +6502,24 @@@ expand_deps() unique $lib_deps } +#we have to remove gpl from the deps here as some code assumes all lib deps are libs +postproc_deps="$(filter_out 'gpl' $postproc_deps)" + map 'expand_deps $v' $LIBRARY_LIST ++license="LGPL version 2.1 or later" ++if enabled nonfree; then ++ license="nonfree and unredistributable" ++elif enabled gplv3; then ++ license="GPL version 3 or later" ++elif enabled lgplv3; then ++ license="LGPL version 3 or later" ++elif enabled gpl; then ++ license="GPL version 2 or later" ++fi ++ + if test "$quiet" != "yes"; then + echo "install prefix $prefix" echo "source path $source_path" echo "C compiler $cc" @@@ -6614,26 -5201,26 +6630,17 @@@ for type in decoder encoder hwaccel par echo done --license="LGPL version 2.1 or later" --if enabled nonfree; then -- license="nonfree and unredistributable" --elif enabled gplv3; then -- license="GPL version 3 or later" --elif enabled lgplv3; then -- license="LGPL version 3 or later" --elif enabled gpl; then -- license="GPL version 2 or later" --fi -- echo "License: $license" -echo "Creating config.mak and config.h..." +echo "Creating config.mak, config.h, and doc/config.texi..." + fi # test "$quiet" != "yes" + test -e Makefile || echo "include $source_path/Makefile" > Makefile -config_files="$TMPH config.mak" +enabled stripping || strip="echo skipping strip" + +config_files="$TMPH config.mak doc/config.texi" cat > config.mak <<EOF # Automatically generated by configure - do not modify! _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
