X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=configure.ng;h=49fc75a969870bf54971fccc76dfc53defbdb431;hp=a3cab6aee2a77b31cc901aa92ca5795ea5b5e415;hb=a14eb495b75c8c2a2a32ddb6eecf50dc174f811c;hpb=46b0eef721b9b3eec37d29aff65b6a7fc488a887

diff --git a/configure.ng b/configure.ng
index a3cab6ae..49fc75a9 100644
--- a/configure.ng
+++ b/configure.ng
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -110,7 +110,7 @@ esac
 # Add additional CFLAGS, eventually specified on the command line:
 test -n "$CFLAGS_ADD" && CFLAGS="$CFLAGS $CFLAGS_ADD"
 
-CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
+CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"' -DDOCDIR='\"\$(docdir)\"'"
 
 # -- Headers --
 
@@ -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 --
@@ -164,11 +164,11 @@ AC_SEARCH_LIBS([memmove], [UTIL], [], [
 	AC_MSG_ERROR([unable to find the memmove() function])
 ])
 # gethostbyname: Solaris libnsl
-AC_SEARCH_LIBS([gethostbyname], [nsl], [], [
+AC_SEARCH_LIBS([gethostbyname], [bind nsl network], [], [
 	AC_MSG_ERROR([unable to find the gethostbyname() function])
 ])
 # bind: SVR4 libsocket
-AC_SEARCH_LIBS([bind], [socket], [], [
+AC_SEARCH_LIBS([bind], [socket network], [], [
 	AC_MSG_ERROR([unable to find the bind() function])
 ])
 
@@ -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"
@@ -526,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)
@@ -604,7 +609,6 @@ test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
 
 AC_CONFIG_FILES([ \
 	Makefile \
-	contrib/Anope/Makefile \
 	contrib/Debian/Makefile \
 	contrib/MacOSX/Makefile \
 	contrib/MacOSX/ngIRCd.pmdoc/Makefile \
@@ -712,7 +716,8 @@ echo $ECHO_N "   libiconv support: $ECHO_C"
 
 echo
 
-if ! grep "^AUTOMAKE_OPTIONS = ../portab/ansi2knr" src/ngircd/Makefile.am >/dev/null 2>&1; then
+define(_automake_regex_,[[^AUTOMAKE_OPTIONS = [a-z .\-]*/portab/ansi2knr]])
+if ! grep "_automake_regex_" src/ngircd/Makefile.am >/dev/null 2>&1; then
 	echo "WARNING:"
 	echo "This GNU automake generated build system does not support \"de-ANSI-fication\","
 	echo "therefore don't use it to generate \"official\" distribution archives!"