Include gnulib headers.

[elisp/starttls.git] / configure.in

diff --git a/configure.in b/configure.in
index 757c89c..db0be33 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,29 +1,19 @@
 AC_INIT(starttls.el)
-AC_PREREQ(2.50)
+AC_PREREQ(2.59)
 AM_INIT_AUTOMAKE(starttls, 0.10)
 
-AM_PATH_LISPDIR
-
 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(libgen.h sys/select.h sys/poll.h)
-
-AC_STRUCT_ADDRINFO(ac_cv_struct_addrinfo)
-if test "$ac_cv_struct_addrinfo" = "no"; then
-       AC_CHECK_LIB(nsl, gethostbyname)
-fi
 AC_CHECK_LIB(socket, socket)
 
-AC_CHECK_FUNC(getopt_long,,[
-       AC_LIBOBJ(getopt)
-       AC_LIBOBJ(getopt1)])
-AC_REPLACE_FUNCS(basename)
-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]),
        use_gnutls=true, use_gnutls=false)
@@ -44,5 +34,10 @@ else
                AC_CHECK_LIB(ssl, SSL_CTX_new, LIBS="-lssl $LIBS")],
                AC_MSG_ERROR([OpenSSL not installed - please install first]))
 fi
+gl_INIT
+
+AM_PATH_LISPDIR
 
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES(Makefile
+lib/Makefile)
+AC_OUTPUT