X-Git-Url: http://git.pk910.de/?p=srvx.git;a=blobdiff_plain;f=configure.in;h=a3a885165a080b602c80af02da02b311a5ace647;hp=9a154d7fc371d6bd6e249a7f14021e120ec349b6;hb=HEAD;hpb=4a2c9aa9ab119a212d78c6a3a73261de56800251

diff --git a/configure.in b/configure.in
index 9a154d7..a3a8851 100644
--- 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])
-CODENAME=surge
+AC_PREREQ(2.64)
+AC_INIT([srvx],[1.4.0-rc3],[srvx-bugs@lists.sourceforge.net])
+CODENAME=wgn
 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
-AM_INIT_AUTOMAKE([gnu 1.6])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([gnu 1.10 silent-rules])
 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,10 +21,10 @@ 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
+AC_PROG_RANLIB
 
 dnl Look for a git client
 AC_CHECK_PROGS(GIT, [git])
@@ -69,21 +70,21 @@ AC_HEADER_TIME
 AC_STRUCT_TM
 
 dnl Would rather not bail on headers, BSD has alot of the functions elsewhere. -Jedi
-AC_CHECK_HEADERS(fcntl.h malloc.h netdb.h arpa/inet.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h regex.h arpa/inet.h sys/mman.h sys/stat.h dirent.h sys/epoll.h,,)
+AC_CHECK_HEADERS(fcntl.h malloc.h netdb.h arpa/inet.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h regex.h arpa/inet.h sys/mman.h sys/stat.h dirent.h sys/epoll.h sys/event.h stdint.h,,)
 
 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>])
 
 dnl We have fallbacks in case these are missing, so just check for them.
-AC_CHECK_FUNCS(freeaddrinfo getaddrinfo gai_strerror getnameinfo getpagesize memcpy memset strdup strerror strsignal localtime_r setrlimit getopt getopt_long regcomp regexec regfree sysconf inet_aton epoll_create select gettimeofday times GetProcessTimes mprotect,,)
+AC_CHECK_FUNCS(freeaddrinfo getaddrinfo gai_strerror getnameinfo getpagesize memcpy memset strdup strerror strsignal localtime localtime_r setrlimit getopt getopt_long regcomp regexec regfree sysconf inet_aton epoll_create kqueue kevent select gettimeofday times GetProcessTimes mprotect,,)
 
 dnl Check for the fallbacks for functions missing above.
 if test $ac_cv_func_gettimeofday = no; then
@@ -227,7 +228,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
@@ -256,6 +257,26 @@ if test "x$withval" = xyes ; then
   IOMUXES="$IOMUXES epoll"
 fi
 
+AC_ARG_WITH([kevent],
+[  --without-kevent        Disables the kevent() I/O backend],
+[],
+[withval="$ac_cv_func_kevent"])
+if test "x$withval" = xyes ; then
+  AC_DEFINE(WITH_IOSET_KEVENT, 1, [Define if using the kevent I/O backend])
+  MODULE_OBJS="$MODULE_OBJS ioset-kevent.\$(OBJEXT)"
+  IOMUXES="$IOMUXES kevent"
+fi
+
+AC_ARG_WITH([win32],
+[  --with-win32            Enables the Win32 I/O backend],
+[],
+[withval="no"])
+if test "x$withval" = xyes ; then
+  AC_DEFINE(WITH_IOSET_WIN32, 1, [Define if using the Win32 I/O backend])
+  MODULE_OBJS="$MODULE_OBJS ioset-win32.\$(OBJEXT)"
+  IOMUXES="$IOMUXES win32"
+fi
+
 IOMUXES=`echo $IOMUXES | sed 's/^ +//'`
 if test "x$IOMUXES" = "x" ; then
   AC_MSG_ERROR([No supported I/O multiplexing backend found])
@@ -313,7 +334,7 @@ AC_ARG_ENABLE(modules,
   module_list=""
   dnl Must use a separate file because autoconf can't stand newlines in an AC_SUBSTed variable.
   for module in $enableval ; do
-    module=`echo $module | sed -e s/^mod-// -e s/\.c\$//`
+    module=`echo $module | sed -e s/^mod-// -e s/\\\.c\\\$//`
     EXTRA_MODULE_OBJS="$EXTRA_MODULE_OBJS mod-$module.\$(OBJEXT)"
     module_list="$module_list $module"
     echo "WITH_MODULE($module)" >> $MODULE_DEFINES
@@ -337,7 +358,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])