[FFmpeg-cvslog] build: fix iconv detection on some systems.
Clément Bœsch
git at videolan.org
Wed Feb 27 21:02:51 CET 2013
ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Wed Feb 27 20:58:48 2013 +0100| [2ecf564f94f8b638d73e957eb9594a9b781e2028] | committer: Clément Bœsch
build: fix iconv detection on some systems.
This at least fix the build on CentOS.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ecf564f94f8b638d73e957eb9594a9b781e2028
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index f442715..2f8a532 100755
--- a/configure
+++ b/configure
@@ -3765,7 +3765,7 @@ check_func getopt
check_func getrusage
check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
check_func gettimeofday
-check_func iconv || check_lib2 iconv.h iconv -liconv
+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
More information about the ffmpeg-cvslog
mailing list