From a14eb495b75c8c2a2a32ddb6eecf50dc174f811c Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Mon, 18 Mar 2013 12:45:32 +0100
Subject: [PATCH 1/1] 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".
---
 configure.ng | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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)
-- 
2.39.2