[svn-commits] tilghman: trunk r320579 - in /trunk: ./ configure configure.ac

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon May 23 11:20:59 2011
New Revision: 320579

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=320579
Log:
Merged revisions 320573 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r320573 | tilghman | 2011-05-23 11:19:32 -0500 (Mon, 23 May 2011) | 7 lines
  
  GNU libiconv uses symbol "libiconv_open" instead of "iconv_open".
  
  (closes issue #19344)
   Reported by: rohanl
   Patches: 
         iconv-check.patch uploaded by rohanl (license 1284)
........

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=320579&r1=320578&r2=320579
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon May 23 11:20:59 2011
@@ -1142,6 +1142,8 @@
 fi
 
 AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h])
+# GNU libiconv #define's iconv_open to libiconv_open, so we need to search for that symbol
+AST_EXT_LIB_CHECK([ICONV], [iconv], [libiconv_open], [iconv.h])
 # Some versions of Linux package iconv in glibc
 AST_EXT_LIB_CHECK([ICONV], [c], [iconv_close], [iconv.h])