Add doc/Contributing.txt to distribution archive

[ngircd-alex.git] / configure.in

diff --git a/configure.in b/configure.in
index 5be4a541c22cf6a6f3d29cb65bf50dcd6c30a73f..34c76e164e5fc06f21ba7078727d8401b45c4166 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@ define(VERSION_ID,esyscmd(git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'|tr -d
 
 # -- Initialisation --
 
-AC_PREREQ([2.67])
+AC_PREREQ([2.61])
 AC_INIT([ngIRCd], VERSION_ID,
        [ngircd-ml@ngircd.barton.de], [ngircd], [http://ngircd.barton.de/])
 
@@ -21,7 +21,7 @@ AC_CONFIG_SRCDIR([src/ngircd/ngircd.c])
 AC_CONFIG_HEADER([src/config.h])
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.11])
+AM_INIT_AUTOMAKE([1.10])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -113,7 +113,7 @@ AC_CHECK_HEADERS([ \
        ],,AC_MSG_ERROR([required C header missing!]))
 
 # Optional header files
-AC_CHECK_HEADERS([ \
+AC_CHECK_HEADERS_ONCE([ \
        arpa/inet.h inttypes.h malloc.h netinet/ip.h stdbool.h stddef.h \
        stdint.h varargs.h \
        ])
@@ -147,17 +147,22 @@ AC_CHECK_MEMBER([struct sockaddr_in.sin_len], AC_DEFINE(HAVE_sockaddr_in_len),,
 
 # -- Libraries --
 
-# A/UX needs this.
-AC_CHECK_LIB(UTIL,memmove)
-# needed on solaris. GNU libc also has a libnsl, but we do not need it.
-AC_SEARCH_LIBS(gethostbyname,nsl)
-AC_CHECK_LIB(socket,bind)
+# memmove: A/UX libUTIL
+AC_SEARCH_LIBS([memmove], [UTIL], [], [
+       AC_MSG_ERROR([unable to find the memmove() function])
+])
+# gethostbyname: Solaris libnsl
+AC_SEARCH_LIBS([gethostbyname], [nsl], [], [
+       AC_MSG_ERROR([unable to find the gethostbyname() function])
+])
+# bind: SVR4 libsocket
+AC_SEARCH_LIBS([bind], [socket], [], [
+       AC_MSG_ERROR([unable to find the bind() function])
+])
 
 # -- Functions --
 
 AC_FUNC_FORK
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
 AC_FUNC_STRFTIME
 
 # Required functions
@@ -169,7 +174,7 @@ AC_CHECK_FUNCS([ \
        AC_MSG_ERROR([required function missing!]))
 
 # Optional functions
-AC_CHECK_FUNCS([ \
+AC_CHECK_FUNCS_ONCE([ \
        gai_strerror getaddrinfo getnameinfo inet_aton sigaction sigprocmask \
        snprintf vsnprintf strdup strlcpy strlcat strtok_r waitpid])
 
@@ -187,15 +192,12 @@ AC_ARG_WITH(syslog,
                                CPPFLAGS="-I$withval/include $CPPFLAGS"
                                LDFLAGS="-L$withval/lib $LDFLAGS"
                        fi
-                       AC_CHECK_LIB(be, syslog)
-                       AC_CHECK_FUNCS(syslog, x_syslog_on=yes,
+                       AC_SEARCH_LIBS([syslog], [be], [x_syslog_on=yes], [
                                AC_MSG_ERROR([Can't enable syslog!])
-                       )
+                       ])
                fi
        ],
-       [
-               AC_CHECK_LIB(be, syslog)
-               AC_CHECK_FUNCS(syslog, x_syslog_on=yes)
+       [       AC_SEARCH_LIBS([syslog], [be], [x_syslog_on=yes])
        ]
 )
 if test "$x_syslog_on" = "yes"; then