X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=configure.in;h=d60257e8ec0bd432bb0cef4348e7983bbaab9b1f;hb=a6aa8be630ab2e06572188745def44d1be0a6775;hp=20c4b2dc5ceb411a923df6cbaa367af7f9236668;hpb=2dd23fa4a784abdf9121cf00824ca9cb0cb1b138;p=elisp%2Fstarttls.git

diff --git a/configure.in b/configure.in
index 20c4b2d..d60257e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,41 +1,42 @@
 AC_INIT(starttls.el)
-AM_INIT_AUTOMAKE(starttls, 0.6)
-
-AM_PATH_LISPDIR
+AC_PREREQ(2.50)
+AM_INIT_AUTOMAKE(starttls, 0.10)
 
 AC_PROG_CC
 AC_ISC_POSIX
+AC_PROG_CPP
+gl_EARLY
+
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
-AC_CHECK_HEADERS(libgen.h sys/select.h socks.h sys/poll.h)
-
-AC_CHECK_LIB(nsl, gethostbyname)
 AC_CHECK_LIB(socket, socket)
-AC_CHECK_TYPE(fd_set, int)
-AC_REPLACE_FUNCS(basename getaddrinfo)
-AC_CHECK_FUNC(poll)
 
-AC_STRUCT_ADDRINFO(ac_cv_struct_addrinfo)
-if test "$ac_cv_struct_addrinfo" = "yes"; then
-	AC_DEFINE(HAVE_ADDRINFO)
-else
-	AC_DEFINE(NEED_ADDRINFO_H)
-	AC_CHECK_BITTYPES(ac_cv_bittypes)
-	AC_STRUCT_SA_STORAGE(ac_cv_sa_storage)
-fi
-
-AC_ARG_WITH(openssl,[  --with-openssl=PATH     use OpenSSL from PATH])
+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)
+AM_CONDITIONAL(USE_GNUTLS, test x$use_gnutls = xtrue)
 
-if test -n "$with_openssl"; then
-	CPPFLAGS="${CPPFLAGS} -I${with_openssl}/include"
-	LDFLAGS="${LDFLAGS} -L${with_openssl}/lib"
+if $use_gnutls; then
+	AC_CHECK_HEADER(gnutls/gnutls.h, [
+		AC_DEFINE(USE_GNUTLS)
+		AC_CHECK_LIB(gnutls, gnutls_global_init, LIBS="-lgnutls $LIBS")],
+		[GnuTLS is selected, but it is not installed])
+else
+	if test -n "$with_openssl"; then
+		CPPFLAGS="$CPPFLAGS -I${with_openssl}/include"
+		LDFLAGS="$LDFLAGS -L${with_openssl}/lib"
+	fi
+	AC_CHECK_HEADER(openssl/ssl.h, [
+		AC_CHECK_LIB(crypto, BIO_accept, LIBS="-lcrypto $LIBS")
+		AC_CHECK_LIB(ssl, SSL_CTX_new, LIBS="-lssl $LIBS")],
+		AC_MSG_ERROR([OpenSSL not installed - please install first]))
 fi
+gl_INIT
 
-AC_CHECK_HEADER(openssl/ssl.h, [
-	AC_CHECK_LIB(crypto, BIO_accept, LIBS="-lcrypto ${LIBS}")
-	AC_CHECK_LIB(ssl, SSL_CTX_new, LIBS="-lssl ${LIBS}")],
-	AC_MSG_ERROR([OpenSSL not installed - please install first]))
+AM_PATH_LISPDIR
 
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES(Makefile
+lib/Makefile)
+AC_OUTPUT