RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace fail test with the die function. 

Originally committed as revision 7373 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-12-24 03:12:36 +00:00
parent 5931bfc383
commit 6cf161d21e
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
configure vendored
View File

@ -1117,34 +1117,28 @@ EOF
fi fi
if test "$libvorbis" = "yes" && test "$libogg" = "no"; then if test "$libvorbis" = "yes" && test "$libogg" = "no"; then
echo "libogg must be enabled to enable libvorbis." die "libogg must be enabled to enable libvorbis."
fail="yes"
fi fi
if test "$gpl" != "yes"; then if test "$gpl" != "yes"; then
if test "$pp" != "no"; then if test "$pp" != "no"; then
echo "The Postprocessing code is under GPL and --enable-gpl is not specified." die "The Postprocessing code is under GPL and --enable-gpl is not specified."
fail="yes"
fi fi
if test "$a52" != "no" -o "$a52bin" != "no"; then if test "$a52" != "no" -o "$a52bin" != "no"; then
echo "liba52 is under GPL and --enable-gpl is not specified." die "liba52 is under GPL and --enable-gpl is not specified."
fail="yes"
fi fi
if test "$xvid" != "no"; then if test "$xvid" != "no"; then
echo "libxvidcore is under GPL and --enable-gpl is not specified." die "libxvidcore is under GPL and --enable-gpl is not specified."
fail="yes"
fi fi
if test "$x264" != "no"; then if test "$x264" != "no"; then
echo "x264 is under GPL and --enable-gpl is not specified." die "x264 is under GPL and --enable-gpl is not specified."
fail="yes"
fi fi
if test "$dts" != "no"; then if test "$dts" != "no"; then
echo "libdts is under GPL and --enable-gpl is not specified." die "libdts is under GPL and --enable-gpl is not specified."
fail="yes"
fi fi
if test "$faad" != "no" -o "$faadbin" != "no"; then if test "$faad" != "no" -o "$faadbin" != "no"; then
@ -1157,8 +1151,7 @@ if test "$gpl" != "yes"; then
int main( void ) { return 0; } int main( void ) { return 0; }
EOF EOF
if test $? = 0 ; then if test $? = 0 ; then
echo "FAAD2 is under GPL and --enable-gpl is not specified." die "FAAD2 is under GPL and --enable-gpl is not specified."
fail="yes"
fi fi
else else
faad="no" faad="no"
@ -1168,20 +1161,14 @@ EOF
fi fi
if test "$x11grab" != "no"; then if test "$x11grab" != "no"; then
echo "The X11 grabber is under GPL and --enable-gpl is not specified." die "The X11 grabber is under GPL and --enable-gpl is not specified."
fail="yes"
fi fi
if test "$swscaler" != "no"; then if test "$swscaler" != "no"; then
echo "The software scaler is under GPL and --enable-gpl is not specified." die "The software scaler is under GPL and --enable-gpl is not specified."
fail="yes"
fi fi
fi fi
if test "$fail" = "yes"; then
exit 1
fi
# compute MMX state # compute MMX state
if test $mmx = "default"; then if test $mmx = "default"; then
if test $arch = "x86_32" -o $arch = "x86_64"; then if test $arch = "x86_32" -o $arch = "x86_64"; then