Merge branch 'bug151-iconv' into master

[ngircd-alex.git] / configure.ng

diff --git a/configure.ng b/configure.ng
index 034b565305232131f5e63126c49cab0a7768a150..6c28f39a9e0ed81937a65f2b04cdc96012fc3613 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -519,7 +519,7 @@ if test "$x_ircplus_on" = "yes"; then
        x_iconv_on=no
        AC_ARG_WITH(iconv,
                AS_HELP_STRING([--with-iconv],
-                              [enable character conversation using libiconv]),
+                              [enable character conversion using libiconv]),
                [ if test "$withval" != "no"; then
                        if test "$withval" != "yes"; then
                                CFLAGS="-I$withval/include $CFLAGS"
@@ -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
                ]