aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <cboesch@gopro.com>2017-07-28 12:58:39 +0200
committerClément Bœsch <u@pkh.me>2017-09-02 16:14:15 +0200
commitc9075d2c652bd90a5b559a9fa38dd0fd3de377e7 (patch)
tree3ea7beab08f210214aa8bd6799ecb85482b0151d
parent55fdfc88b844aa31af58bb4cdae7b071c76869a9 (diff)
downloadffmpeg-c9075d2c652bd90a5b559a9fa38dd0fd3de377e7.tar.gz
build: treat iconv like other autodetected libraries
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
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"