diff options
| -rwxr-xr-x | configure | 31 |
1 files changed, 19 insertions, 12 deletions
@@ -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" |