[FFmpeg-cvslog] build: treat iconv like other autodetected libraries
Clément Bœsch
git at videolan.org
Sat Sep 2 17:14:51 EEST 2017
ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Fri Jul 28 12:58:39 2017 +0200| [c9075d2c652bd90a5b559a9fa38dd0fd3de377e7] | committer: Clément Bœsch
build: treat iconv like other autodetected libraries
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9075d2c652bd90a5b559a9fa38dd0fd3de377e7
---
configure | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 75a3c97bcb..5dc0ed47f6 100755
--- a/configure
+++ b/configure
@@ -3605,6 +3605,8 @@ enable_weak cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder
# Enable compression/decompression libraries by default
enable_weak zlib bzlib lzma
+enable_weak iconv
+
disabled logging && logfile=/dev/null
die_license_disabled() {
@@ -6203,7 +6205,7 @@ int main(void) { return 0; }
EOF
# Funny iconv installations are not unusual, so check it after all flags have been set
-disabled iconv || check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv
+enabled iconv && check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv
enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
More information about the ffmpeg-cvslog
mailing list