AC_INIT(starttls.el)
-AC_PREREQ(2.50)
+AC_PREREQ(2.59)
AM_INIT_AUTOMAKE(starttls, 0.10)
AC_PROG_CC
AC_ISC_POSIX
+AC_PROG_CPP
+AC_PROG_EGREP
gl_EARLY
AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PROG_RANLIB
-AC_CHECK_HEADERS(sys/select.h sys/poll.h)
AC_CHECK_LIB(socket, socket)
-AC_CHECK_FUNC(poll)
AC_ARG_WITH(openssl, AC_HELP_STRING([--with-openssl=PATH], [use OpenSSL from PATH]))
AC_ARG_WITH(gnutls, AC_HELP_STRING([--with-gnutls], [use GnuTLS instead of OpenSSL]),