RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-15 03:41:41 +00:00
Code Issues Projects Releases Wiki Activity

configure: Simplify dlopen check

Browse Source
This commit is contained in:
Diego Biurrun 2017-01-24 13:57:52 +01:00
parent d7b2bb5391
commit d154bdd3d0
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configure vendored
View File

@ -1612,7 +1612,6 @@ SYSTEM_FUNCS="
CommandLineToArgvW CommandLineToArgvW
CoTaskMemFree CoTaskMemFree
CryptGenRandom CryptGenRandom
dlopen
fcntl fcntl
flt_lim flt_lim
fork fork
@ -2222,10 +2221,8 @@ wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel" wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
# hardware-accelerated codecs # hardware-accelerated codecs
nvenc_deps_any="dlopen LoadLibrary" nvenc_deps_any="libdl LoadLibrary"
nvenc_extralibs='$ldl' omx_deps="libdl pthreads"
omx_deps="dlopen pthreads"
omx_extralibs='$ldl'
omx_rpi_select="omx" omx_rpi_select="omx"
qsvdec_select="qsv" qsvdec_select="qsv"
qsvenc_select="qsv" qsvenc_select="qsv"
@ -2284,7 +2281,7 @@ mjpeg2jpeg_bsf_select="jpegtables"
# external libraries # external libraries
avisynth_deps="LoadLibrary" avisynth_deps="LoadLibrary"
avxsynth_deps="dlopen" avxsynth_deps="libdl"
avisynth_demuxer_deps_any="avisynth avxsynth" avisynth_demuxer_deps_any="avisynth avxsynth"
avisynth_demuxer_select="riffdec" avisynth_demuxer_select="riffdec"
libdcadec_decoder_deps="libdcadec" libdcadec_decoder_deps="libdcadec"
@ -2477,10 +2474,8 @@ deinterlace_vaapi_filter_deps="vaapi"
delogo_filter_deps="gpl" delogo_filter_deps="gpl"
drawtext_filter_deps="libfreetype" drawtext_filter_deps="libfreetype"
drawtext_filter_suggest="libfontconfig" drawtext_filter_suggest="libfontconfig"
frei0r_filter_deps="frei0r dlopen" frei0r_filter_deps="frei0r libdl"
frei0r_filter_extralibs='$ldl' frei0r_src_filter_deps="frei0r libdl"
frei0r_src_filter_deps="frei0r dlopen"
frei0r_src_filter_extralibs='$ldl'
hdcd_filter_deps="libhdcd" hdcd_filter_deps="libhdcd"
hqdn3d_filter_deps="gpl" hqdn3d_filter_deps="gpl"
interlace_filter_deps="gpl" interlace_filter_deps="gpl"
@ -4469,12 +4464,6 @@ check_code cc arm_neon.h "int16x8_t test = vdupq_n_s16(0)" && enable intrinsics_
check_ldflags -Wl,--as-needed check_ldflags -Wl,--as-needed
if check_func dlopen; then
ldl=
elif check_func dlopen -ldl; then
ldl=-ldl
fi
if ! disabled network; then if ! disabled network; then
check_func getaddrinfo $network_extralibs check_func getaddrinfo $network_extralibs
check_func inet_aton $network_extralibs check_func inet_aton $network_extralibs
@ -4646,6 +4635,9 @@ enabled pthreads &&
disabled zlib || check_lib zlib zlib.h zlibVersion -lz disabled zlib || check_lib zlib zlib.h zlibVersion -lz
disabled bzlib || check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2 disabled bzlib || check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2
# On some systems dynamic loading requires no extra linker flags
check_lib libdl dlfcn.h dlopen || check_lib libdl dlfcn.h dlopen -ldl
check_lib libm math.h sin -lm && LIBM="-lm" check_lib libm math.h sin -lm && LIBM="-lm"
atan2f_args=2 atan2f_args=2
@ -4658,7 +4650,7 @@ done
# these are off by default, so fail if requested and not available # these are off by default, so fail if requested and not available
enabled avisynth && require_header avisynth/avisynth_c.h enabled avisynth && require_header avisynth/avisynth_c.h
enabled avxsynth && require avxsynth "avxsynth/avxsynth_c.h dlfcn.h" dlopen -ldl enabled avxsynth && require_header avxsynth/avxsynth_c.h
enabled cuda && require cuda cuda.h cuInit -lcuda enabled cuda && require cuda cuda.h cuInit -lcuda
enabled frei0r && require_header frei0r.h enabled frei0r && require_header frei0r.h
enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init