summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-30 23:34:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-30 23:34:25 +0200
commita99de9ca2ccbe5f70f887982a909f95820cd1cbf (patch)
tree2cab26422d9c43397235c2b1561d1309914f58e1 /configure
parent1c84aad718f0b2a6c8bd318ebc08240dcbe5ae8b (diff)
parenta0ce85ac7de098d3f9b53b51b77a09bad700a011 (diff)
Merge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011'
* commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011': configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure b/configure
index 1b3f7f24f0..9c3af50569 100755
--- a/configure
+++ b/configure
@@ -5231,6 +5231,8 @@ for thread in $THREADS_LIST; do
fi
done
+enabled zlib && add_cppflags -DZLIB_CONST
+
# conditional library dependencies, in linking order
enabled aconvert_filter && prepend avfilter_deps "swresample"
enabled amovie_filter && prepend avfilter_deps "avformat avcodec"