Update version tag for 1.4.0-rc2.

[srvx.git] / configure.in

diff --git a/configure.in b/configure.in
index c275ea09828103d6b6125bfe6698f20a27b7c1ec..9471c1bdbeb8239fb8a78d0ca9f80d9a89ecfa05 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to create a configure script.
 
 dnl General initialization.
 AC_PREREQ(2.59)
-AC_INIT([srvx],[1.4],[srvx-bugs@lists.sourceforge.net])
+AC_INIT([srvx],[1.4.0-rc2],[srvx-bugs@lists.sourceforge.net])
 CODENAME=surge
 AC_CONFIG_HEADERS(src/config.h)
 AC_CONFIG_SRCDIR(src/opserv.c)
@@ -69,7 +69,7 @@ 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],
@@ -83,7 +83,7 @@ AC_CHECK_MEMBER([struct addrinfo.ai_flags],
 #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,,)
+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
@@ -141,32 +141,6 @@ fi
 dnl Check for post-C89 keywords
 AC_C_INLINE
 
-dnl Now figure out how to printf() a time_t
-AC_MSG_CHECKING(for time_t format)
-AC_CACHE_VAL(ac_cv_fmt_time_t, [
-ac_cv_fmt_time_t=no
-AC_COMPILE_IFELSE([#include <sys/types.h>
-#include <stdio.h>
-void myfunc(void) {
-  time_t test=0;
-  printf("%li", test);
-}], ac_cv_fmt_time_t="\"%li\"")
-if test $ac_cv_fmt_time_t = no; then
-AC_COMPILE_IFELSE([#include <sys/types.h>
-#include <stdio.h>
-void myfunc(void) {
-  time_t test=0;
-  printf("%i", test);
-}], ac_cv_fmt_time_t="\"%i\"")
-fi
-if test $ac_cv_fmt_time_t = no; then
-AC_MSG_ERROR([Cannot detect format string for time_t
-Please check sys/types.h for the typedef of time_t and submit to a developer])
-fi
-])
-AC_DEFINE_UNQUOTED(FMT_TIME_T, $ac_cv_fmt_time_t, [Define to printf format for a time_t variable])
-AC_MSG_RESULT($ac_cv_fmt_time_t)
-
 dnl How to copy one va_list to another?
 AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy, [AC_LINK_IFELSE(
   [AC_LANG_PROGRAM([#include <stdarg.h>], [va_list ap1, ap2; va_copy(ap1, ap2);])],
@@ -282,6 +256,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])