Merge branch 'bug151-iconv' into master

* bug151-iconv:
  configure: search for iconv_open as well as libiconv_open

diff --git a/configure.ng b/configure.ng
index c0309965de4fb16c492c4244b0a3821bf3c4324c..6c28f39a9e0ed81937a65f2b04cdc96012fc3613 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -528,7 +528,10 @@ if test "$x_ircplus_on" = "yes"; then
                        fi
                        AC_CHECK_LIB(iconv, iconv_open)
                        AC_CHECK_FUNCS(iconv_open, x_iconv_on=yes,
-                               AC_MSG_ERROR([Can't enable libiconv support!])
+                               AC_CHECK_LIB(iconv, libiconv_open)
+                               AC_CHECK_FUNCS(libiconv_open, x_iconv_on=yes,
+                                       AC_MSG_ERROR([Can't enable libiconv support!])
+                               )
                        )
                  fi
                ]