Commit Diff

Commit:
a14eb495b75c8c2a2a32ddb6eecf50dc174f811c
From:
Alexander Barton <alex@barton.de>
Date:
Message:
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".
Actions:
Patch | Tree
commit - 0131e1e00bc8ad35b030dfa6b8ab769b0657e174
commit + a14eb495b75c8c2a2a32ddb6eecf50dc174f811c
blob - 6c28f39a9e0ed81937a65f2b04cdc96012fc3613
blob + 49fc75a969870bf54971fccc76dfc53defbdb431
--- configure.ng
+++ 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)