[SCM] libav/experimental: rewrite some one-line if/then/fi using && and ||

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:56:13 UTC 2013


The following commit has been merged in the experimental branch:
commit 703afd0780e211dd880a93aca33df08dd1c124d0
Author: Måns Rullgård <mans at mansr.com>
Date:   Sun Feb 11 11:22:17 2007 +0000

    rewrite some one-line if/then/fi using && and ||
    
    Originally committed as revision 7917 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index b710128..102ba6c 100755
--- a/configure
+++ b/configure
@@ -1273,9 +1273,7 @@ if test $targetos = Darwin; then
     fi
 fi
 
-if ! disabled optimize ; then
-    add_cflags "-fomit-frame-pointer"
-fi
+disabled optimize || add_cflags -fomit-frame-pointer
 
 # Can only do AltiVec on PowerPC
 if test $altivec = "default"; then
@@ -1620,13 +1618,9 @@ elif check_func dlopen -ldl; then
     ldl=-ldl
 fi
 
-if test "$vhook" = "default"; then
-    vhook="$dlopen"
-fi
+test "$vhook" = "default" && vhook="$dlopen"
 
-if enabled_any vhook liba52bin libfaadbin; then
-    add_extralibs $ldl
-fi
+enabled_any vhook liba52bin libfaadbin && add_extralibs $ldl
 
 if test "$targetos" = "CYGWIN" && enabled lstatic ; then
     vhook="no"
@@ -1641,9 +1635,7 @@ if enabled vhook; then
     check_ldflags -export-dynamic
 fi
 
-if enabled audio_beos; then
-    add_extralibs "-lmedia -lbe"
-fi
+enabled audio_beos && add_extralibs "-lmedia -lbe"
 
 ##########################################
 # imlib check

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list