X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=configure.in;h=20102d4e2e97950ed4aa81f24ebe571617948cc2;hp=7a15b2ba5a4268c58253ad35a3c49d55448550ae;hb=74c7d7131f6754e1afa9b1ec7b95e95824475c97;hpb=25c216cbdf0a5db739bdf0551db16a510e8ac4a1;ds=sidebyside

diff --git a/configure.in b/configure.in
index 7a15b2ba..20102d4e 100644
--- a/configure.in
+++ b/configure.in
@@ -13,12 +13,15 @@ define(VERSION_ID,esyscmd(git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'|tr -d
 
 # -- Initialisation --
 
-AC_PREREQ(2.50)
-AC_INIT(ngircd, VERSION_ID)
-AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
+AC_PREREQ([2.67])
+AC_INIT([ngIRCd], VERSION_ID,
+	[ngircd-ml@ngircd.barton.de], [ngircd], [http://ngircd.barton.de/])
+
+AC_CONFIG_SRCDIR([src/ngircd/ngircd.c])
+AC_CONFIG_HEADER([src/config.h])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(1.6)
-AC_CONFIG_HEADER(src/config.h)
+
+AM_INIT_AUTOMAKE([1.11])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -45,7 +48,6 @@ AH_TEMPLATE([TARGET_CPU], [Target CPU name])
 
 AC_PROG_CC
 AC_PROG_CC_STDC
-AC_C_PROTOTYPES
 
 # -- Helper programs --
 
@@ -104,25 +106,17 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_TIME
 
+# Required header files
 AC_CHECK_HEADERS([ \
-	ctype.h errno.h fcntl.h netdb.h netinet/in.h netinet/in_systm.h \
-	stdlib.h string.h strings.h sys/socket.h sys/time.h unistd.h \
+	fcntl.h inttypes.h netdb.h netinet/in.h netinet/in_systm.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([ \
-	arpa/inet.h ctype.h malloc.h netinet/ip.h stdbool.h stddef.h varargs.h \
-	],[],[],[[
-	#ifdef HAVE_SYS_TYPES_H
-		#include <sys/types.h>
-	#endif
-	#ifdef HAVE_SYS_SOCKET_H
-		#include <sys/socket.h>
-	#endif
-	#ifdef HAVE_NETINET_IN_H
-		#include <netinet/in.h>
-	#endif
-	]]
-)
+	arpa/inet.h malloc.h netinet/ip.h stdbool.h stddef.h stdint.h \
+	varargs.h \
+	])
 
 # -- Datatypes --
 
@@ -139,8 +133,14 @@ AC_TRY_COMPILE([
 	AC_MSG_RESULT(no)
 ])
 
+AC_TYPE_PID_T
 AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UID_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT8_T
 
 AC_CHECK_MEMBER([struct sockaddr_in.sin_len], AC_DEFINE(HAVE_sockaddr_in_len),,
  [#include <arpa/inet.h>])
@@ -156,16 +156,22 @@ AC_CHECK_LIB(socket,bind)
 # -- Functions --
 
 AC_FUNC_FORK
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
 AC_FUNC_STRFTIME
 
+# Required functions
 AC_CHECK_FUNCS([ \
-	bind gethostbyaddr gethostbyname gethostname inet_ntoa \
-	setsid setsockopt socket strcasecmp waitpid],,
+	alarm dup2 endpwent gethostbyaddr gethostbyname gethostname \
+	gettimeofday inet_ntoa memmove memset setsid socket strcasecmp \
+	strchr strcspn strerror strncasecmp strrchr strspn strstr \
+	],,
 	AC_MSG_ERROR([required function missing!]))
 
+# Optional functions
 AC_CHECK_FUNCS([ \
-	gai_strerror getaddrinfo getnameinfo inet_aton sigaction \
-	sigprocmask snprintf vsnprintf strdup strlcpy strlcat strtok_r])
+	gai_strerror getaddrinfo getnameinfo inet_aton sigaction sigprocmask \
+	snprintf vsnprintf strdup strlcpy strlcat strtok_r waitpid])
 
 # -- Configuration options --
 
@@ -542,7 +548,7 @@ test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
 
 # -- Generate files --
 
-AC_OUTPUT([ \
+AC_CONFIG_FILES([ \
 	Makefile \
 	contrib/Anope/Makefile \
 	contrib/Debian/Makefile \
@@ -561,6 +567,8 @@ AC_OUTPUT([ \
 	src/tool/Makefile \
 ])
 
+AC_OUTPUT
+
 type dpkg >/dev/null 2>&1
 if test $? -eq 0; then
 	# Generate debian/ link if the dpkg command exists