aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Daniel Dupas <devlists@shadowlab.org>2010-07-30 00:05:16 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-07-30 00:05:16 +0000
commit8fad26610193efeb3a4076329ee616a29c0f837d (patch)
treecfb71518887b7490662f8c49cdb7fff57b1dd998
parent3dec10cded6d51e392da67a9136d490324104d18 (diff)
downloadffmpeg-8fad26610193efeb3a4076329ee616a29c0f837d.tar.gz
Make pkgconfig_generate() explicitly return 0 in instead of returning
without value when the target library is disabled. If it does not explicitly return 0, when the last library is disabled (swscale), the final "configure" exit value is 1, even if the configure script is successfully executed. So it breaks scripts that invoke configure and rely on 0 for success and 1 for failure. Patch by Jean-Daniel Dupas reverse(<org.shadowlab@devlists>). Originally committed as revision 24585 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index a6ee5e2a52..d6f06818e4 100755
--- a/configure
+++ b/configure
@@ -3192,7 +3192,7 @@ comment=$2
version=$3
libs=$4
requires=$5
-enabled $shortname || return
+enabled $shortname || return 0
cat <<EOF > $name/$name.pc
prefix=$prefix
exec_prefix=\${prefix}