build: make iconv build configurable.

configure

@@ -188,6 +188,7 @@ External library support:
   --enable-fontconfig      enable fontconfig
   --enable-frei0r          enable frei0r video filtering
   --enable-gnutls          enable gnutls [no]
+  --enable-iconv           enable iconv [autodetect]
   --enable-libaacplus      enable AAC+ encoding via libaacplus [no]
   --enable-libass          enable libass subtitles rendering [no]
   --enable-libbluray       enable BluRay reading using libbluray [no]
@@ -1122,6 +1123,7 @@ EXTERNAL_LIBRARY_LIST="
     fontconfig
     frei0r
     gnutls
+    iconv
     libaacplus
     libass
     libbluray
@@ -1406,7 +1408,6 @@ HAVE_LIST="
     gnu_as
     gsm_h
     ibm_asm
-    iconv
     inet_aton
     io_h
     isatty
@@ -3765,7 +3766,6 @@ check_func  getopt
 check_func  getrusage
 check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
 check_func  gettimeofday
-check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv
 check_func  inet_aton $network_extralibs
 check_func  isatty
 check_func  localtime_r
@@ -3821,6 +3821,7 @@ check_header asm/types.h
 
 disabled  zlib || check_lib   zlib.h      zlibVersion -lz   || disable  zlib
 disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
+disabled iconv || check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv || disable iconv
 
 if ! disabled w32threads && ! enabled pthreads; then
     check_func_headers "windows.h process.h" _beginthreadex && enable w32threads

libavcodec/utils.c

@@ -48,7 +48,7 @@
 #include <stdarg.h>
 #include <limits.h>
 #include <float.h>
-#if HAVE_ICONV
+#if CONFIG_ICONV
 # include <iconv.h>
 #endif
 
@@ -1116,7 +1116,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
                 if (avctx->sub_charenc_mode == FF_SUB_CHARENC_MODE_AUTOMATIC)
                     avctx->sub_charenc_mode = FF_SUB_CHARENC_MODE_PRE_DECODER;
 
-                if (!HAVE_ICONV && avctx->sub_charenc_mode == FF_SUB_CHARENC_MODE_PRE_DECODER) {
+                if (!CONFIG_ICONV && avctx->sub_charenc_mode == FF_SUB_CHARENC_MODE_PRE_DECODER) {
                     av_log(avctx, AV_LOG_ERROR, "Character encoding subtitles "
                            "conversion needs a libavcodec built with iconv support "
                            "for this codec\n");
@@ -1887,7 +1887,7 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
 static int recode_subtitle(AVCodecContext *avctx,
                            AVPacket *outpkt, const AVPacket *inpkt)
 {
-#if HAVE_ICONV
+#if CONFIG_ICONV
     iconv_t cd = (iconv_t)-1;
     int ret = 0;
     char *inb, *outb;
@@ -1898,7 +1898,7 @@ static int recode_subtitle(AVCodecContext *avctx,
     if (avctx->sub_charenc_mode != FF_SUB_CHARENC_MODE_PRE_DECODER)
         return 0;
 
-#if HAVE_ICONV
+#if CONFIG_ICONV
     cd = iconv_open("UTF-8", avctx->sub_charenc);
     if (cd == (iconv_t)-1) {
         av_log(avctx, AV_LOG_ERROR, "Unable to open iconv context "

tests/fate/subtitles.mak

@@ -52,8 +52,7 @@ fate-sub-vplayer: CMD = md5 -i $(SAMPLES)/sub/VPlayer_capability_tester.txt -f a
 FATE_SUBTITLES_ASS-$(call DEMDEC, WEBVTT, WEBVTT) += fate-sub-webvtt
 fate-sub-webvtt: CMD = md5 -i $(SAMPLES)/sub/WebVTT_capability_tester.vtt -f ass
 
-FATE_SUBTITLES_CHARENC-$(HAVE_ICONV) = fate-sub-charenc
-FATE_SUBTITLES_ASS-$(call DEMDEC, MICRODVD, MICRODVD) += $(FATE_SUBTITLES_CHARENC-yes)
+FATE_SUBTITLES_ASS-$(call ALLYES, MICRODVD_DEMUXER MICRODVD_DECODER ICONV) += fate-sub-charenc
 fate-sub-charenc: CMD = md5 -sub_charenc cp1251 -i $(SAMPLES)/sub/cp1251-subtitles.sub -f ass
 
 FATE_SUBTITLES-$(call ENCMUX, ASS, ASS) += $(FATE_SUBTITLES_ASS-yes)