[FFmpeg-devel] [PATCH 3/8] build: treat iconv like other autodetected libraries

Clément Bœsch u at pkh.me
Fri Jul 28 14:51:40 EEST 2017


From: Clément Bœsch <cboesch at gopro.com>

---
 configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index a2ad72f7f4..5ba171d459 100755
--- a/configure
+++ b/configure
@@ -3596,6 +3596,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() {
@@ -6179,7 +6181,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"
 
-- 
2.13.3



More information about the ffmpeg-devel mailing list