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

build: make sure a disabled autodetect still pick the libc's iconv

This commit is contained in:
Clément Bœsch 2017-08-30 12:26:01 +02:00 committed by Clément Bœsch
parent e3c1219c7c
commit fe9c85e4e2
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -3592,6 +3592,11 @@ for e in $env; do
done done
if disabled autodetect; then if disabled autodetect; then
# Unless iconv is explicitely disabled by the user, we still want to probe
# for the iconv from the libc.
disabled iconv || enable libc_iconv
disable_weak $EXTERNAL_AUTODETECT_LIBRARY_LIST disable_weak $EXTERNAL_AUTODETECT_LIBRARY_LIST
disable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST disable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST
fi fi
@ -6193,7 +6198,11 @@ int main(void) { return 0; }
EOF EOF
# Funny iconv installations are not unusual, so check it after all flags have been set # Funny iconv installations are not unusual, so check it after all flags have been set
enabled iconv && check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv if enabled libc_iconv; then
check_func_headers iconv.h iconv
elif enabled iconv; then
check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv
fi
enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel" enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"