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

diff --git a/configure.in b/configure.in
index 31ef1d6..d60257e 100644
--- a/configure.in
+++ b/configure.in
@@ -2,30 +2,19 @@ AC_INIT(starttls.el)
 AC_PREREQ(2.50)
 AM_INIT_AUTOMAKE(starttls, 0.10)
 
-AM_PATH_LISPDIR
-
 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 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,[  --with-openssl=PATH     use OpenSSL from PATH])
-AC_ARG_WITH(gnutls,[  --with-gnutls     use GnuTLS instead of OpenSSL],
+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)
 
@@ -44,5 +33,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