From: Alexander Barton <alex@barton.de>
Date: Fri, 15 Feb 2013 20:59:28 +0000 (+0100)
Subject: Merge branch 'bug151-iconv' into master
X-Git-Tag: rel-21-rc1~132
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=2c96966431d99ce611736ed841e813c1fac6df8c;hp=65359ff8f722efdf24700ce05011afc0fef28924

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 c0309965..6c28f39a 100644
--- 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
 		]