highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '59d2b00d201935c16408a2917957d89a170fe58f'

Browse Source 
* 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 <cboesch@gopro.com>
This commit is contained in:
Clément Bœsch 2017-03-31 10:22:32 +02:00
commit b6c293d5e6
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
configure vendored
View File

@ -63,6 +63,7 @@ Options: [defaults in brackets after descriptions]
Help options: Help options:
--help print this message --help print this message
--quiet Suppress showing informative output
--list-decoders show all available decoders --list-decoders show all available decoders
--list-encoders show all available encoders --list-encoders show all available encoders
--list-hwaccels show all available hardware accelerators --list-hwaccels show all available hardware accelerators
@ -1417,7 +1418,7 @@ EOF
} }
cp_if_changed(){ 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)" mkdir -p "$(dirname $2)"
$cp_f "$1" "$2" $cp_f "$1" "$2"
} }
@ -3509,6 +3510,8 @@ for opt do
;; ;;
--help|-h) show_help --help|-h) show_help
;; ;;
--quiet|-q) quiet=yes
;;
--fatal-warnings) enable fatal_warnings --fatal-warnings) enable fatal_warnings
;; ;;
*) *)
@ -6504,6 +6507,19 @@ postproc_deps="$(filter_out 'gpl' $postproc_deps)"
map 'expand_deps $v' $LIBRARY_LIST 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 "install prefix $prefix"
echo "source path $source_path" echo "source path $source_path"
echo "C compiler $cc" echo "C compiler $cc"
@ -6614,21 +6630,12 @@ for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf ind
echo echo
done 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 "License: $license"
echo "Creating config.mak, config.h, and doc/config.texi..." echo "Creating config.mak, config.h, and doc/config.texi..."
fi # test "$quiet" != "yes"
test -e Makefile || echo "include $source_path/Makefile" > Makefile test -e Makefile || echo "include $source_path/Makefile" > Makefile
enabled stripping || strip="echo skipping strip" enabled stripping || strip="echo skipping strip"