X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=configure.ng;h=faf3086b6b87b2d5d3d964e9024f4f067d8c056e;hp=034b565305232131f5e63126c49cab0a7768a150;hb=1b349b05d5040de19921f087785310dfe24ef5df;hpb=fd260404caa7ce174ada663024d19cd789c152b5

diff --git a/configure.ng b/configure.ng
index 034b5653..faf3086b 100644
--- a/configure.ng
+++ b/configure.ng
@@ -188,7 +188,7 @@ AC_CHECK_FUNCS([ \
 # Optional functions
 AC_CHECK_FUNCS_ONCE([ \
 	gai_strerror getaddrinfo getnameinfo inet_aton sigaction sigprocmask \
-	snprintf vsnprintf strdup strlcpy strlcat strtok_r waitpid])
+	snprintf vsnprintf strdup strndup strlcpy strlcat strtok_r waitpid])
 
 # -- Configuration options --
 
@@ -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"
@@ -527,11 +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)
+			fi
+			if test "$x_iconv_on" != "yes"; then
 				AC_MSG_ERROR([Can't enable libiconv support!])
-			)
-		  fi
-		]
+			fi
+		fi ]
 	)
 	if test "$x_iconv_on" = "yes"; then
 		AC_DEFINE(ICONV, 1)
@@ -698,7 +702,7 @@ test "$x_ipv6_on" = "yes" \
 	&& echo $ECHO_N "yes   $ECHO_C" \
 	|| echo $ECHO_N "no    $ECHO_C"
 echo $ECHO_N "        I/O backend: $ECHO_C"
-	echo "\"$x_io_backend\""
+	echo "$x_io_backend"
 
 echo $ECHO_N "        PAM support: $ECHO_C"
 test "$x_pam_on" = "yes" \