-build system changes for epoll support

1 files changed, 38 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index c4380511..8f64f6c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 #
 # libmicrohttpd is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
-# by the Free Software Foundation; either version 2, or (at your
+# by the Free Software Foundation; either version 3, or (at your
 # option) any later version.
 #
 # libmicrohttpd is distributed in the hope that it will be useful, but
@@ -21,15 +21,15 @@
 #
 #
 AC_PREREQ(2.57)
-AC_INIT([libmicrohttpd], [0.9.27],[libmicrohttpd@gnu.org])
+AC_INIT([libmicrohttpd], [0.9.28],[libmicrohttpd@gnu.org])
 AM_INIT_AUTOMAKE([silent-rules])
 AC_CONFIG_HEADERS([MHD_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AH_TOP([#define _GNU_SOURCE  1])
 
-LIB_VERSION_CURRENT=27
+LIB_VERSION_CURRENT=28
 LIB_VERSION_REVISION=0
-LIB_VERSION_AGE=17
+LIB_VERSION_AGE=18
 AC_SUBST(LIB_VERSION_CURRENT)
 AC_SUBST(LIB_VERSION_REVISION)
 AC_SUBST(LIB_VERSION_AGE)
@@ -96,7 +96,7 @@ fi
 
 # for pkg-config
 MHD_LIBDEPS=""
-
+epoll=0
 # Check system type
 case "$host_os" in
 *darwin* | *rhapsody* | *macosx*)
@@ -136,13 +136,27 @@ netbsd*)
      AC_DEFINE_UNQUOTED(HAVE_LISTEN_SHUTDOWN,1,[can use shutdown on listen sockets])
      CFLAGS="-D_REENTRANT -fPIC -pipe $CFLAGS"
      AM_CONDITIONAL(HAVE_GNU_LD, true)    
-     AM_CONDITIONAL(HAVE_W32, false)        
+     AM_CONDITIONAL(HAVE_W32, false)
+     AC_MSG_CHECKING(whether to support epoll)
+     AC_ARG_ENABLE([epoll],
+                AS_HELP_STRING([--disable-epoll],
+                        [disable epoll]),
+                [enable_epoll=${enableval}],
+                [enable_epoll=yes])
+     AC_MSG_RESULT($enable_epoll)
      ;;
 *linux*)
      AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux kernel])
      AC_DEFINE_UNQUOTED(HAVE_LISTEN_SHUTDOWN,1,[can use shutdown on listen sockets])
      AM_CONDITIONAL(HAVE_GNU_LD, true)    
      AM_CONDITIONAL(HAVE_W32, false)        
+     AC_MSG_CHECKING(whether to support epoll)
+     AC_ARG_ENABLE([epoll],
+                AS_HELP_STRING([--disable-epoll],
+                        [disable epoll]),
+                [enable_epoll=${enableval}],
+                [enable_epoll=yes])
+     AC_MSG_RESULT($enable_epoll)
      ;;
 *cygwin*)
      AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
@@ -180,6 +194,23 @@ netbsd*)
 ;;
 esac
 
+
+if test "$enable_epoll" = "yes"
+then
+ AC_CHECK_HEADERS([sys/epoll.h], 
+                   [enable_epoll="yes"], 
+                   [enable_epoll="no"])
+fi
+
+if test "$enable_epoll" = "yes"
+then
+ AC_DEFINE([EPOLL_SUPPORT],[1],[include epoll support])
+else
+ AC_DEFINE([EPOLL_SUPPORT],[0],[disable epoll support])
+fi
+AM_CONDITIONAL(ENABLE_EPOLL, [test "x$enable_epoll" != "xno"])
+
+
 CHECK_PTHREAD
 LIBS="$PTHREAD_LIBS $LIBS"
 AC_SUBST(PTHREAD_LIBS)
@@ -547,6 +578,7 @@ AC_MSG_NOTICE([Configuration Summary:
   Digest auth.:      ${enable_dauth}
   Postproc:          ${enable_postprocessor}
   HTTPS support:     ${enable_https}
+  epoll support:     ${enable_epoll}
   libmicrospdy:      ${enable_spdy}
   spdylay (testing): ${have_spdylay}
 ])