diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-25 22:42:51 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-25 22:42:51 +0000 |
| commit | 52898aff7b908609a2987aeb5384cb2d22b710a1 (patch) | |
| tree | 3f56fe45ea5e5b11f483a83a2d67dcf0cd39ec8e /configure.ac | |
| parent | a9b8e64139ea99c7d418229798f97916d849b437 (diff) | |
Merged revisions 214152 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r214152 | tilghman | 2009-08-25 17:39:51 -0500 (Tue, 25 Aug 2009) | 4 lines
Not all versions of gnu-linux use glibc, which contains iconv. Some (especially embedded systems) don't have iconv at all.
(closes issue #15169)
Reported by: pprindeville
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@214154 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index b388df28f..72f3c0653 100644 --- a/configure.ac +++ b/configure.ac @@ -740,11 +740,9 @@ if test "${USE_GSM}" != "no"; then fi fi -if test "${host_os}" != "linux-gnu" ; then - AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h]) -else - PBX_ICONV=1 -fi +AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h]) +# Some versions of Linux package iconv in glibc +AST_EXT_LIB_CHECK([ICONV], [c], [iconv_close], [iconv.h]) AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h]) |