[SCM] libav/experimental: Make use of enabled_any().

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


The following commit has been merged in the experimental branch:
commit ec5527c516eb4ee5aa66f05d0c3468ffbbfa795f
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sun Jan 28 16:22:07 2007 +0000

    Make use of enabled_any().
    
    Originally committed as revision 7743 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 1d01d50..b4c0d82 100755
--- a/configure
+++ b/configure
@@ -1232,7 +1232,7 @@ if test "$gpl" != "yes"; then
         die "The Postprocessing code is under GPL and --enable-gpl is not specified."
     fi
 
-    if test "$liba52" != "no" -o "$liba52bin" != "no"; then
+    if enabled_any liba52 liba52bin ; then
         die "liba52 is under GPL and --enable-gpl is not specified."
     fi
 
@@ -1248,7 +1248,7 @@ if test "$gpl" != "yes"; then
         die "libdts is under GPL and --enable-gpl is not specified."
     fi
 
-    if test "$libfaad" != "no" -o "$libfaadbin" != "no"; then
+    if enabled_any libfaad libfaadbin ; then
         if check_header faad.h; then
             check_cc << EOF
                 #include <faad.h>

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list