Move m4 support files into m4/ directory.

[srvx.git] / configure.in

diff --git a/configure.in b/configure.in
index 3bc1459eaf635d7791a0f3620aa57ffe35fc8f80..cdfb57d11b156bae95251acce05999a4d442ec3f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,18 +1,19 @@
 dnl Process this file with autoconf to create a configure script.
 
 dnl General initialization.
-AC_PREREQ(2.59)
-AC_INIT([srvx],[1.4.0],[srvx-bugs@lists.sourceforge.net])
+AC_PREREQ(2.64)
+AC_INIT([srvx],[1.4.0-rc3],[srvx-bugs@lists.sourceforge.net])
 CODENAME=surge
 AC_CONFIG_HEADERS(src/config.h)
 AC_CONFIG_SRCDIR(src/opserv.c)
 dnl AM_CANONICAL_TARGET must be before AM_INIT_AUTOMAKE() or autoconf whines
 AC_CANONICAL_TARGET
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([gnu 1.6])
 AM_MAINTAINER_MODE
+LT_INIT
 
 dnl Compiler/runtime feature checks.
-AC_TYPE_SIGNAL
 AC_C_CONST
 dnl "const" *should* be in the -Werror section, but that breaks Linux. gg gcc.
 
@@ -20,7 +21,6 @@ dnl Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_GCC_TRADITIONAL
@@ -73,11 +73,11 @@ AC_CHECK_HEADERS(fcntl.h malloc.h netdb.h arpa/inet.h netinet/in.h sys/resource.
 
 dnl portability stuff, hurray! -Jedi
 AC_CHECK_MEMBER([struct sockaddr.sa_len],
-                [AC_DEFINE([HAVE_SOCKADDR_SA_LEN],,[Define if struct sockaddr has sa_len field])],
+                [AC_DEFINE([HAVE_SOCKADDR_SA_LEN],[1],[Define if struct sockaddr has sa_len field])],
                 [],[#include <sys/types.h>
 #include <sys/socket.h>])
 AC_CHECK_MEMBER([struct addrinfo.ai_flags],
-                [AC_DEFINE([HAVE_STRUCT_ADDRINFO],,[Define if struct addrinfo declared])],
+                [AC_DEFINE([HAVE_STRUCT_ADDRINFO],[1],[Define if struct addrinfo declared])],
                 [],[#include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>])
@@ -227,7 +227,7 @@ fi
 AC_MSG_CHECKING(how to send mail)
 AC_ARG_WITH(mail,
 [  --with-mail=name        How to send mail; one of:
-                          sendmail (the default)],
+                          sendmail (the default), smtp],
 [],
 [withval="sendmail"])
 if test -r "${srcdir}/src/mail-${withval}.c" ; then
@@ -257,7 +257,7 @@ if test "x$withval" = xyes ; then
 fi
 
 AC_ARG_WITH([kevent],
-[  --without-kevent         Disables the kevent() I/O backend],
+[  --without-kevent        Disables the kevent() I/O backend],
 [],
 [withval="$ac_cv_func_kevent"])
 if test "x$withval" = xyes ; then
@@ -267,7 +267,7 @@ if test "x$withval" = xyes ; then
 fi
 
 AC_ARG_WITH([win32],
-[  --with-win32             Enables the Win32 I/O backend],
+[  --with-win32            Enables the Win32 I/O backend],
 [],
 [withval="no"])
 if test "x$withval" = xyes ; then
@@ -357,7 +357,7 @@ fi
 MY_SUBDIRS="$MY_SUBDIRS src"
 CFLAGS="$CFLAGS $ANSI_SRC -W -Wall"
 if test "z$USE_MAINTAINER_MODE" = zyes ; then
-  CFLAGS="$CFLAGS -Werror -ansi"
+  CFLAGS="$CFLAGS -Werror -Wshadow -ansi"
 fi
 
 AC_DEFINE_UNQUOTED(CODENAME, "${CODENAME}", [Code name for this release])