Commit 9a46fe75 authored by Ramiro Polla's avatar Ramiro Polla Committed by Diego Biurrun

Change one occurence of 'test $foo = yes -o test $bar = yes' to

'enabled_any foo bar', and one occurence of
'test $foo = yes && test $bar = yes' to 'enabled_all foo bar'.
patch by Ramiro Polla, ramiro lisha.ufsc br

Originally committed as revision 7723 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 90be59ef
...@@ -1138,8 +1138,8 @@ else ...@@ -1138,8 +1138,8 @@ else
logfile=/dev/null logfile=/dev/null
fi fi
if test "$mingw32" = "yes" -o "$wince" = "yes"; then if enabled_any mingw32 wince; then
if test "$lshared" = "yes" && test "$lstatic" = "yes" ; then if enabled_all lshared lstatic; then
cat <<EOF cat <<EOF
You can only build one library type at once on MinGW. You can only build one library type at once on MinGW.
Specify --disable-static --enable-shared to only build Specify --disable-static --enable-shared to only build
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment