From: Alexander Barton Date: Mon, 18 Mar 2013 11:45:32 +0000 (+0100) Subject: Make configure[.ng] compatible with autoconf 1.10 again X-Git-Tag: rel-21-rc1~111 X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=a14eb495b75c8c2a2a32ddb6eecf50dc174f811c;hp=0131e1e00bc8ad35b030dfa6b8ab769b0657e174;ds=sidebyside Make configure[.ng] compatible with autoconf 1.10 again The incompatibility has been introduced by commit d0c9f4a6, "configure: search for iconv_open as well as libiconv_open". --- diff --git a/configure.ng b/configure.ng index 6c28f39a..49fc75a9 100644 --- a/configure.ng +++ b/configure.ng @@ -527,14 +527,15 @@ if test "$x_ircplus_on" = "yes"; then LDFLAGS="-L$withval/lib $LDFLAGS" fi AC_CHECK_LIB(iconv, iconv_open) - AC_CHECK_FUNCS(iconv_open, x_iconv_on=yes, + AC_CHECK_FUNCS(iconv_open, x_iconv_on=yes) + if test "$x_iconv_on" != "yes"; then AC_CHECK_LIB(iconv, libiconv_open) - AC_CHECK_FUNCS(libiconv_open, x_iconv_on=yes, - AC_MSG_ERROR([Can't enable libiconv support!]) - ) - ) - fi - ] + AC_CHECK_FUNCS(libiconv_open, x_iconv_on=yes) + fi + if test "$x_iconv_on" != "yes"; then + AC_MSG_ERROR([Can't enable libiconv support!]) + fi + fi ] ) if test "$x_iconv_on" = "yes"; then AC_DEFINE(ICONV, 1)