aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-25 22:42:43 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-25 22:42:43 +0000
commita22f4158011b92ecc5e015f766bc77e7c180816b (patch)
tree0b4a51ec036f94160b9d90f01c36a5d171601036 /configure.ac
parentff73a9d84f53506c3371a7fb79437874a11c3861 (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.0@214153 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac8
1 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index ce3f23ea8..490e32f92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -726,11 +726,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])