[SCM] libav/experimental: Replace fail test with the die function.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:54:29 UTC 2013
The following commit has been merged in the experimental branch:
commit 6cf161d21ec309b50830e3b5c864f1ecacc31b80
Author: Diego Biurrun <diego at biurrun.de>
Date: Sun Dec 24 03:12:36 2006 +0000
Replace fail test with the die function.
Originally committed as revision 7373 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/configure b/configure
index d68d39b..71de5d1 100755
--- a/configure
+++ b/configure
@@ -1117,34 +1117,28 @@ EOF
fi
if test "$libvorbis" = "yes" && test "$libogg" = "no"; then
- echo "libogg must be enabled to enable libvorbis."
- fail="yes"
+ die "libogg must be enabled to enable libvorbis."
fi
if test "$gpl" != "yes"; then
if test "$pp" != "no"; then
- echo "The Postprocessing code is under GPL and --enable-gpl is not specified."
- fail="yes"
+ die "The Postprocessing code is under GPL and --enable-gpl is not specified."
fi
if test "$a52" != "no" -o "$a52bin" != "no"; then
- echo "liba52 is under GPL and --enable-gpl is not specified."
- fail="yes"
+ die "liba52 is under GPL and --enable-gpl is not specified."
fi
if test "$xvid" != "no"; then
- echo "libxvidcore is under GPL and --enable-gpl is not specified."
- fail="yes"
+ die "libxvidcore is under GPL and --enable-gpl is not specified."
fi
if test "$x264" != "no"; then
- echo "x264 is under GPL and --enable-gpl is not specified."
- fail="yes"
+ die "x264 is under GPL and --enable-gpl is not specified."
fi
if test "$dts" != "no"; then
- echo "libdts is under GPL and --enable-gpl is not specified."
- fail="yes"
+ die "libdts is under GPL and --enable-gpl is not specified."
fi
if test "$faad" != "no" -o "$faadbin" != "no"; then
@@ -1157,8 +1151,7 @@ if test "$gpl" != "yes"; then
int main( void ) { return 0; }
EOF
if test $? = 0 ; then
- echo "FAAD2 is under GPL and --enable-gpl is not specified."
- fail="yes"
+ die "FAAD2 is under GPL and --enable-gpl is not specified."
fi
else
faad="no"
@@ -1168,20 +1161,14 @@ EOF
fi
if test "$x11grab" != "no"; then
- echo "The X11 grabber is under GPL and --enable-gpl is not specified."
- fail="yes"
+ die "The X11 grabber is under GPL and --enable-gpl is not specified."
fi
if test "$swscaler" != "no"; then
- echo "The software scaler is under GPL and --enable-gpl is not specified."
- fail="yes"
+ die "The software scaler is under GPL and --enable-gpl is not specified."
fi
fi
-if test "$fail" = "yes"; then
- exit 1
-fi
-
# compute MMX state
if test $mmx = "default"; then
if test $arch = "x86_32" -o $arch = "x86_64"; then
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list