X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=configure.in;h=41c1aaf925e915a30e0695326e658356e72a53bd;hp=249cd14e98020f8c7ed5f6cf2a618525a7aa354f;hb=30c0381d71d333a99f6c83ff9d03ef4a0857f423;hpb=5fc1ed17f41f0c535cf57a4b7e00cd6d45759503

diff --git a/configure.in b/configure.in
index 249cd14e..41c1aaf9 100644
--- 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.58 2002/09/09 19:39:53 guus Exp $
+dnl $Id: configure.in,v 1.13.2.65 2003/07/07 11:11:33 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*)
@@ -86,8 +86,13 @@ dnl Checks for libraries.
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
-net/ethernet.h net/if.h netinet/in_systm.h netinet/ip.h netinet/tcp.h \
-sys/file.h sys/ioctl.h sys/param.h sys/time.h])
+	sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h])
+AC_CHECK_HEADERS([net/ethernet.h net/if.h netinet/ip.h netinet/tcp.h netinet/ip6.h], [], [],
+	[#include <sys/types.h>
+	 #include <sys/socket.h>
+	 #ifdef HAVE_NETINET_IN_SYSTM_H
+     #include <netinet/in_systm.h>
+	 #endif])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -96,40 +101,20 @@ 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 in6_addr, 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
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([asprintf daemon fcloseall flock ftime get_current_dir_name \
-putenv select strdup strerror strsignal strtol unsetenv \
-freeaddrinfo gai_strerror getaddrinfo getnameinfo mlockall])
+putenv select strdup strerror strsignal strtol unsetenv mlockall vsyslog])
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
@@ -142,12 +127,15 @@ AC_CHECK_FUNC(gethostbyname, [], [
   AC_CHECK_LIB(nsl, gethostbyname)
 ])
 
+AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo])
+
 AC_CACHE_SAVE
 
 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,
@@ -163,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
 )