[SCM] libav/experimental: 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

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:55:37 UTC 2013


The following commit has been merged in the experimental branch:
commit 9a46fe7509e3d239feff7b3ae420d9c1fe5a8b11
Author: Ramiro Polla <ramiro at lisha.ufsc.br>
Date:   Sat Jan 27 07:58:21 2007 +0000

    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

diff --git a/configure b/configure
index 7b6accb..db20262 100755
--- a/configure
+++ b/configure
@@ -1138,8 +1138,8 @@ else
     logfile=/dev/null
 fi
 
-if test "$mingw32" = "yes" -o "$wince" = "yes"; then
-    if test "$lshared" = "yes" && test "$lstatic" = "yes" ; then
+if enabled_any mingw32 wince; then
+    if enabled_all lshared lstatic; then
         cat <<EOF
 You can only build one library type at once on MinGW.
 Specify --disable-static --enable-shared to only build

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list