diff mbox

[FFmpeg-devel,03/16] build: treat iconv like other autodetected libraries

Message ID 20170830120915.13050-4-u@pkh.me
State New
Headers show

Commit Message

Clément Bœsch Aug. 30, 2017, 12:09 p.m. UTC 
From: Clément Bœsch <cboesch@gopro.com>

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

Patch

diff --git a/configure b/configure
index a9932aeba6..b4b1288722 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() {
@@ -6202,7 +6204,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"