Proper epoll check, remove snprintf check

diff --git a/configure.in b/configure.in
index b2e75a9026cf5eb9cdb2d57f0ac85919163f8d5f..628d1a682a1f60a30d5fa5ba9e90f263420f433a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -76,6 +76,7 @@ AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, [#include <time.h>])
 
 dnl these tests have been comfirmed to be needed in 2011
 AC_CHECK_FUNC(renameat, AC_DEFINE([_ATFILE_SOURCE], 1, AT file source)) 
+AC_CHECK_FUNC(epoll_create, AC_DEFINE([HAVE_EPOLL], 1, Whether Linux epoll is available)) 
 AC_CHECK_FUNCS(backtrace_symbols dirfd getusershell pread pwrite pselect)
 AC_CHECK_FUNCS(setlinebuf strlcat strlcpy strnlen)
 
@@ -89,9 +90,6 @@ fi
 AC_SUBST(PTHREAD_LIBS)
 AC_CACHE_SAVE
 
-dnl Checks for (v)snprintf
-NETATALK_SNPRINTF_CHECK
-
 dnl --------------------------------------------------------------------------
 dnl 64bit platform check
 dnl --------------------------------------------------------------------------

diff --git a/macros/Makefile.am b/macros/Makefile.am
index 38f728711e1af493bac5da84b21f51ed472a92dd..7910a3b29a191217cdd2566739cc79c15189ac5c 100644 (file)
--- a/macros/Makefile.am
+++ b/macros/Makefile.am
@@ -13,7 +13,6 @@ EXTRA_DIST = \
        perl-check.m4           \
        ps-check.m4             \
        quota-check.m4          \
-       snprintf-check.m4       \
        srvloc.m4               \
        ssl-check.m4            \
        summary.m4              \

diff --git a/macros/snprintf-check.m4 b/macros/snprintf-check.m4
deleted file mode 100644 (file)
index bee8ad7..0000000
--- a/macros/snprintf-check.m4
+++ /dev/null
@@ -1,132 +0,0 @@
-dnl Check for (v)snprintf functions
-
-AC_DEFUN([NETATALK_SNPRINTF_CHECK], [
-       AC_CHECK_FUNCS(snprintf vsnprintf)
-
-       AC_CHECK_HEADERS(stdarg.h varargs.h)
-
-       AC_CHECK_FUNCS(strerror)
-       AC_CACHE_CHECK(for errno,
-       ac_cv_errno,
-       [
-       AC_TRY_LINK(,[extern int errno; return (errno);],
-               ac_cv_errno=yes, ac_cv_errno=no)
-       ])
-       if test "$ac_cv_errno" = yes; then
-               AC_DEFINE(HAVE_ERRNO, 1, [Define if errno declaration exists])
-               AC_CACHE_CHECK(for errno declaration,
-               ac_cv_decl_errno,
-               [
-               AC_TRY_COMPILE([
-               #include <stdio.h>
-               #ifdef HAVE_STDLIB_H
-               #include <stdlib.h>
-               #endif
-               #ifdef HAVE_UNISTD_H
-               #include <unistd.h>
-               #endif
-               #ifdef HAVE_ERRNO_H
-               #include <errno.h>
-               #endif
-               ],[return(sys_nerr);],
-                       ac_cv_decl_errno=yes, ac_cv_decl_errno=no)
-               ])
-               if test "$ac_cv_decl_errno" = yes; then
-                       AC_DEFINE(HAVE_DECL_ERRNO, 1, [Define if errno declaration exists])
-               fi;
-       fi
-
-       AC_CACHE_CHECK(for sys_nerr,
-       ac_cv_sys_nerr,
-       [
-       AC_TRY_LINK(,[extern int sys_nerr; return (sys_nerr);],
-               ac_cv_sys_nerr=yes, ac_cv_sys_nerr=no)
-       ])
-       if test "$ac_cv_sys_nerr" = yes; then
-               AC_DEFINE(HAVE_SYS_NERR, 1, [Define if sys_nerr declaration exists])
-               AC_CACHE_CHECK(for sys_nerr declaration,
-               ac_cv_decl_sys_nerr,
-               [
-               AC_TRY_COMPILE([
-               #include <stdio.h>
-               #ifdef HAVE_STDLIB_H
-               #include <stdlib.h>
-               #endif
-               #ifdef HAVE_UNISTD_H
-               #include <unistd.h>
-               #endif],[return(sys_nerr);],
-               ac_cv_decl_sys_nerr_def=yes, ac_cv_decl_sys_nerr_def=no)
-               ])
-               if test "$ac_cv_decl_sys_nerr" = yes; then
-                       AC_DEFINE(HAVE_DECL_SYS_NERR, 1, [Define if sys_nerr declaration exists])
-               fi
-       fi
-
-
-       AC_CACHE_CHECK(for sys_errlist array,
-       ac_cv_sys_errlist,
-       [AC_TRY_LINK(,[extern char *sys_errlist[];
-               sys_errlist[0];],
-               ac_cv_sys_errlist=yes, ac_cv_sys_errlist=no)
-       ])
-       if test "$ac_cv_sys_errlist" = yes; then
-               AC_DEFINE(HAVE_SYS_ERRLIST, 1, [Define if sys_errlist declaration exists])
-               AC_CACHE_CHECK(for sys_errlist declaration,
-               ac_cv_sys_errlist_def,
-               [AC_TRY_COMPILE([
-               #include <stdio.h>
-               #include <errno.h>
-               #ifdef HAVE_STDLIB_H
-               #include <stdlib.h>
-               #endif
-               #ifdef HAVE_UNISTD_H
-               #include <unistd.h>
-               #endif],[char *s = sys_errlist[0]; return(*s);],
-               ac_cv_decl_sys_errlist=yes, ac_cv_decl_sys_errlist=no)
-               ])
-               if test "$ac_cv_decl_sys_errlist" = yes; then
-                       AC_DEFINE(HAVE_DECL_SYS_ERRLIST, 1, [Define if sys_errlist declaration exists])
-               fi
-       fi
-
-
-
-       AC_CACHE_CHECK(for long long,
-       ac_cv_long_long,
-       [
-       AC_TRY_COMPILE([
-       #include <stdio.h>
-       #include <sys/types.h>
-       ], [printf("%d",sizeof(long long));],
-       ac_cv_long_long=yes, ac_cv_long_long=no)
-       ])
-       if test $ac_cv_long_long = yes; then
-         AC_DEFINE(HAVE_LONG_LONG, 1, [Define if long long is a valid data type])
-       fi
-
-       AC_CACHE_CHECK(for long double,
-       ac_cv_long_double,
-       [
-       AC_TRY_COMPILE([
-       #include <stdio.h>
-       #include <sys/types.h>
-       ], [printf("%d",sizeof(long double));],
-       ac_cv_long_double=yes, ac_cv_long_double=no)
-       ])
-       if test $ac_cv_long_double = yes; then
-         AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if long double is a valid data type])
-       fi
-
-       AC_CACHE_CHECK(for quad_t,
-       ac_cv_quad_t,
-       [
-       AC_TRY_COMPILE([
-       #include <stdio.h>
-       #include <sys/types.h>
-       ], [printf("%d",sizeof(quad_t));],
-       ac_cv_quad_t=yes, ac_cv_quad_t=no)
-       ])
-       if test $ac_cv_quad_t = yes; then
-         AC_DEFINE(HAVE_QUAD_T, 1, [Define if quad_t is a valid data type])
-       fi
-])