[FFmpeg-cvslog] Revert "build: disable iconv by default."

[Carl Eugen Hoyos]

ffmpeg | branch: release/1.2 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Mar  9 18:25:22 2013 +0100| [0b198e38c52ca716def04433876b8438b4bc218e] | committer: Carl Eugen Hoyos

Revert "build: disable iconv by default."

This reverts commit 9ad3cd5b5f848eb3cd033be515d34296f099148b.

The misdetection on OS X should be fixed, we will only get
problem reports if auto-detection is enabled.
(cherry picked from commit 3f78f0904bfa012b171cecfae87af7c6909c8ede)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b198e38c52ca716def04433876b8438b4bc218e
---

 configure |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index c1dcd55..dff53d8 100755
--- a/configure
+++ b/configure
@@ -188,7 +188,7 @@ External library support:
   --enable-fontconfig      enable fontconfig
   --enable-frei0r          enable frei0r video filtering
   --enable-gnutls          enable gnutls [no]
-  --enable-iconv           enable iconv [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]
@@ -4053,7 +4053,7 @@ enabled vdpau &&
     disable vdpau
 
 # Funny iconv installations are not unusual, so check it after all flags have been set
-enabled iconv && { check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv || die "ERROR: iconv not found"; }
+disabled iconv || check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv || disable iconv
 
 enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
 enabled coverage && add_cflags "-fprofile-arcs -ftest-coverage" && add_ldflags "-fprofile-arcs -ftest-coverage"