Fix typo in "gtrace criteria" help entry.

[srvx.git] / configure.in

diff --git a/configure.in b/configure.in
index dd6474bb110e9b5d7bf99967bbd00f11c20f34e1..b4fde7e86dcc0b33aa27df1b478ed3a9d386a2af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ AM_MAINTAINER_MODE
 dnl Compiler/runtime feature checks.
 AC_TYPE_SIGNAL
 AC_C_CONST
-AC_C_INLINE
+dnl "const" *should* be in the -Werror section, but that breaks Linux. gg gcc.
 
 dnl Checks for programs.
 AC_PROG_AWK
@@ -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,,)
+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,,)
 
 dnl portability stuff, hurray! -Jedi
 AC_CHECK_MEMBER([struct sockaddr.sa_len],
@@ -81,16 +81,17 @@ AC_CHECK_MEMBER([struct addrinfo.ai_flags],
                 [],[#include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>])
-AC_CHECK_FUNCS(gettimeofday)
+
+dnl We have fallbacks in case these are missing, so just check for them.
+AC_CHECK_FUNCS(freeaddrinfo getaddrinfo getnameinfo getpagesize memcpy memset strdup strerror strsignal localtime_r setrlimit getopt getopt_long regcomp regexec regfree sysconf inet_aton epoll_create select gettimeofday,,)
+
+dnl Check for the fallbacks for functions missing above.
 if test $ac_cv_func_gettimeofday = no; then
   AC_CHECK_FUNCS(ftime,,AC_MSG_ERROR([ftime or gettimeofday required.  srvx build will fail.]))
 fi
 
-dnl We have fallbacks in case these are missing, so just check for them.
-AC_CHECK_FUNCS(freeaddrinfo getaddrinfo getnameinfo getpagesize memcpy memset strdup strerror strsignal localtime_r setrlimit getopt getopt_long regcomp regexec regfree sysconf inet_aton,,)
-
 dnl Check for absolutely required library functions.
-AC_CHECK_FUNCS(select socket strcspn strspn strtod strtoul,,AC_MSG_ERROR([a required function was not found.  srvx build will fail.]))
+AC_CHECK_FUNCS(socket strcspn strspn strtod strtoul,,AC_MSG_ERROR([a required function was not found.  srvx build will fail.]))
 
 dnl Check for functions (and how to get them).
 AC_FUNC_ALLOCA
@@ -133,6 +134,12 @@ int getpeername (int $arg2 *, $t *);]], [[$t len;
 dnl Can only check with -Werror, but the rest of configure doesn't like -Werror
 OLD_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS -W -Wall -Werror"
+if test "z$USE_MAINTAINER_MODE" = zyes ; then
+  CFLAGS="$CFLAGS -ansi"
+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)
@@ -250,8 +257,22 @@ if test "x$ac_cv_func_select" = xyes ; then
   IOMUXES="$IOMUXES select"
 fi
 
+AC_ARG_WITH([epoll],
+[  --without-epoll         Disables the epoll_*() I/O backend],
+[],
+[withval="$ac_cv_func_epoll_create"])
+if test "x$withval" = xyes ; then
+  AC_DEFINE(WITH_IOSET_EPOLL, 1, [Define if using the epoll I/O backend])
+  MODULE_OBJS="$MODULE_OBJS ioset-epoll.\$(OBJEXT)"
+  IOMUXES="$IOMUXES epoll"
+fi
+
 IOMUXES=`echo $IOMUXES | sed 's/^ +//'`
-AC_MSG_RESULT($IOMUXES)
+if test "x$IOMUXES" = "x" ; then
+  AC_MSG_ERROR([No supported I/O multiplexing backend found])
+else
+  AC_MSG_RESULT($IOMUXES)
+fi
 
 AC_ARG_WITH(getopt,
 [  --without-getopt        Disables building of the GNU getopt library],
@@ -327,7 +348,7 @@ fi
 MY_SUBDIRS="$MY_SUBDIRS src"
 CFLAGS="$CFLAGS $ANSI_SRC -W -Wall"
 if test "z$USE_MAINTAINER_MODE" = zyes ; then
-  CFLAGS="$CFLAGS -Werror"
+  CFLAGS="$CFLAGS -Werror -ansi"
 fi
 
 AC_DEFINE_UNQUOTED(CODENAME, "${CODENAME}", [Code name for this release])