- simplify configure.in

[tinc] / configure.in

diff --git a/configure.in b/configure.in
index 77db35a..0e76760 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id: configure.in,v 1.13.2.59 2002/09/15 14:55:53 guus Exp $
+dnl $Id: configure.in,v 1.13.2.62 2003/07/06 17:15:24 guus Exp $
 
 AC_PREREQ(2.53)
 AC_INIT(src/tincd.c)
@@ -36,7 +36,7 @@ AC_ISC_POSIX
 
 dnl Check and set OS
 
-AC_CANONICAL_HOST
+#AC_CANONICAL_HOST
 
 case $host_os in
   *linux*)
@@ -101,32 +101,13 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
 
-AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
-[
-  AC_TRY_COMPILE(
+AC_CHECK_TYPES([socklen_t, struct addrinfo, struct sockaddr_in6], , ,
   [#include <sys/types.h>
-  #include <sys/socket.h>],
-  [socklen_t len = 42; return len;],
-  ac_cv_type_socklen_t=yes,
-  ac_cv_type_socklen_t=no)
-])
-if test $ac_cv_type_socklen_t = yes; then
-  AC_DEFINE(HAVE_SOCKLEN_T, 1, [socklen_t available])
-fi
-
-AC_CACHE_CHECK([for struct addrinfo], ac_cv_struct_addrinfo,
-[
-  AC_TRY_COMPILE(
-  [#include <sys/types.h>
-  #include <sys/socket.h>
-  #include <netdb.h>],
-  [struct addrinfo ai; ai.ai_family = AF_INET; return ai.ai_family;],
-  ac_cv_struct_addrinfo=yes,
-  ac_cv_struct_addrinfo=no)
-])
-if test $ac_cv_struct_addrinfo = yes; then
-  AC_DEFINE(HAVE_STRUCT_ADDRINFO, 1, [struct addrinfo available])
-fi
+   #include <sys/socket.h>
+   #include <netdb.h>
+   #include <netinet/in.h>
+  ]
+)
 
 dnl Checks for library functions.
 AC_FUNC_MEMCMP
@@ -154,6 +135,7 @@ dnl These are defined in files in m4/
 tinc_TUNTAP
 tinc_OPENSSL
 tinc_ZLIB
+tinc_LZO
 
 dnl Check if support for jumbograms is requested 
 AC_ARG_ENABLE(jumbograms,
@@ -169,11 +151,11 @@ AC_ARG_ENABLE(tracing,
 
 AC_SUBST(INCLUDES)
 
-AC_OUTPUT(Makefile po/Makefile.in  
+AC_OUTPUT(Makefile 
 src/Makefile
 doc/Makefile
 doc/es/Makefile
 lib/Makefile
-m4/Makefile
 po/Makefile.in
+m4/Makefile
 )