ffmpeg | branch: master | Clément Bœsch <cboe...@gopro.com> | Wed Aug 30 12:26:01 2017 +0200| [fe9c85e4e2650dc9537b54b1eabb4f9be7b628ed] | committer: Clément Bœsch
build: make sure a disabled autodetect still pick the libc's iconv > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe9c85e4e2650dc9537b54b1eabb4f9be7b628ed --- configure | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configure b/configure index f29fe1145c..7c2a196585 100755 --- a/configure +++ b/configure @@ -3592,6 +3592,11 @@ for e in $env; do done 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 $HWACCEL_AUTODETECT_LIBRARY_LIST fi @@ -6193,7 +6198,11 @@ int main(void) { return 0; } EOF # 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" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
