aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorJan Ekström <jeebjp@gmail.com>2018-05-05 21:57:44 +0300
committerJan Ekström <jeebjp@gmail.com>2018-05-06 20:47:42 +0300
commit8d1263fa199ff6dcfc8f0cc94f15f3b429d0c276 (patch)
treec07b3e166f18b97607e21bcd73245bdb9ca224ef /configure
parentb995ec078f42bac95eda18fbd1b4387477b55d0d (diff)
downloadffmpeg-8d1263fa199ff6dcfc8f0cc94f15f3b429d0c276.tar.gz
configure: add pkg-config check for zlib
It exists, so why not use it? Helps one get rid of additional search path related flags in addition to PKG_CONFIG_{PATH,LIBDIR} when utilizing a cross-prefix separate from the sysroot.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index f78853cc6c..2d99c8ea85 100755
--- a/configure
+++ b/configure
@@ -5933,7 +5933,8 @@ if ! disabled pthreads && ! enabled w32threads && ! enabled os2threads; then
fi
fi
-enabled zlib && check_lib zlib zlib.h zlibVersion -lz
+enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion ||
+ check_lib zlib zlib.h zlibVersion -lz; }
enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2
enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma