X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=configure.in;h=5fbf99f57416a7fa1499b16b046632965e35542b;hb=7b0233698bea64f038fed817da09f4e3ed245e0e;hp=9ad79beb588850e685c1ad75a711934e1dd8f123;hpb=dbb34b1d0800a6ebe99adf437969e81a08c404ae;p=elisp%2Fstarttls.git

diff --git a/configure.in b/configure.in
index 9ad79be..5fbf99f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,57 +1,41 @@
 AC_INIT(starttls.el)
-AM_INIT_AUTOMAKE(starttls, 0.5)
-
-AM_PATH_LISPDIR
+AC_PREREQ(2.50)
+AM_INIT_AUTOMAKE(starttls, 0.10)
 
 AC_PROG_CC
 AC_ISC_POSIX
+gl_EARLY
+
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
-AC_CHECK_HEADERS(libgen.h sys/select.h socks.h)
-
-AC_CHECK_LIB(nsl, gethostbyname)
 AC_CHECK_LIB(socket, socket)
-AC_CHECK_TYPE(fd_set, int)
-AC_REPLACE_FUNCS(basename getaddrinfo)
 
-AC_CACHE_CHECK([for struct addrinfo], ac_cv_struct_addrinfo,
-[AC_TRY_COMPILE([#include <netdb.h>
-], [struct addrinfo a],
-ac_cv_struct_addrinfo=yes, ac_cv_struct_addrinfo=no)])
-if test "$ac_cv_struct_addrinfo" = "yes"; then
-	AC_DEFINE(HAVE_ADDRINFO)
-else
-	AC_DEFINE(NEED_ADDRINFO_H)
-fi
+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)
 
-AC_CACHE_CHECK([for NI_MAXSERV], ac_cv_ni_maxserv,
-[AC_EGREP_CPP(yes, [#include <netdb.h>
-#ifdef NI_MAXSERV
-yes
-#endif
-], ac_cv_ni_maxserv=yes, ac_cv_ni_maxserv=no)])
-test "$ac_cv_ni_maxserv" = "yes" || AC_DEFINE(NEED_ADDRINFO_H)
-
-AC_CACHE_CHECK([for NI_NOFQDN], ac_cv_ni_nofqdn,
-[AC_EGREP_CPP(yes, [#include <netdb.h>
-#ifdef NI_NOFQDN
-yes
-#endif
-], ac_cv_ni_nofqdn=yes, ac_cv_ni_nofqdn=no)])
-test "$ac_cv_ni_nofqdn" = "yes" || AC_DEFINE(NEED_ADDRINFO_H)
-
-AC_ARG_WITH(openssl,[  --with-openssl=PATH     use OpenSSL from PATH])
-
-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