diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-23 16:03:50 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-23 16:03:50 +0100 |
| commit | b5ada7e3c038bab1dc0b60a532451c30616e981a (patch) | |
| tree | 1a40faefd8f706b7c44c78ae94d71232c84d2162 /configure.ac | |
| parent | 0ebcf8bc7dcc9f8e71ce23c608e95e23e77d66c9 (diff) | |
| parent | 9be49f3f078dbe9668c8c40b7171a0d039f19682 (diff) | |
Merge branch 'master' into devel
Conflicts:
Makefile.am
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index c7b6761d..5c3af914 100644 --- a/configure.ac +++ b/configure.ac @@ -50,6 +50,12 @@ PKG_CHECK_MODULES(ALSA_DEPS, alsa, HAVE_ALSA=1, NO_ALSA=1) PKG_CHECK_MODULES(FFMPEG_DEPS, libavcodec >= 51.0.0 libavutil libavformat >= 52.0.0, HAVE_FFMPEG=1, NO_FFMPEG=1) AC_CHECK_LIB([pthread], [main]) AC_CHECK_LIB([dl], [main]) +AC_CHECK_LIB([iconv], [main], [have_iconv=yes], [have_iconv=no]) +if test "x${have_iconv}" = "xyes" ; then +ICONV_LIB="-liconv" + AC_SUBST(ICONV_LIB) + AC_DEFINE(HAVE_LIBICONV,1,[Use libiconv instead of glibc iconv]) +fi AX_CHECK_COMPILER_FLAGS(-msse2, HAVE_SSE2=1, []) if test ${HAVE_SSE2}; then |