X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ng;h=6c28f39a9e0ed81937a65f2b04cdc96012fc3613;hb=221365d8efcdc8930ad462756fa2851879f51f7e;hp=47c95990badac3a057b3469380ed011f93dcb870;hpb=0703fcd71983bd04f70101fd0143660174d22f84;p=ngircd-alex.git

diff --git a/configure.ng b/configure.ng
index 47c95990..6c28f39a 100644
--- a/configure.ng
+++ b/configure.ng
@@ -120,14 +120,14 @@ AC_HEADER_TIME
 
 # Required header files
 AC_CHECK_HEADERS([ \
-	fcntl.h netdb.h netinet/in.h netinet/in_systm.h stdlib.h string.h \
+	fcntl.h netdb.h netinet/in.h stdlib.h string.h \
 	strings.h sys/socket.h sys/time.h unistd.h \
 	],,AC_MSG_ERROR([required C header missing!]))
 
 # Optional header files
 AC_CHECK_HEADERS_ONCE([ \
-	arpa/inet.h inttypes.h malloc.h netinet/ip.h stdbool.h stddef.h \
-	stdint.h varargs.h \
+	arpa/inet.h inttypes.h malloc.h netinet/in_systm.h netinet/ip.h \
+	stdbool.h stddef.h stdint.h varargs.h \
 	])
 
 # -- Datatypes --
@@ -518,7 +518,8 @@ if test "$x_ircplus_on" = "yes"; then
 	# CHARCONV is the only function depending on it.
 	x_iconv_on=no
 	AC_ARG_WITH(iconv,
-		[  --with-iconv            enable character conversation using libiconv],
+		AS_HELP_STRING([--with-iconv],
+			       [enable character conversion using libiconv]),
 		[ if test "$withval" != "no"; then
 			if test "$withval" != "yes"; then
 				CFLAGS="-I$withval/include $CFLAGS"
@@ -527,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
 		]