X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=configure.in;h=11d284813d9a8c11ebdbdc750e9bd5e499a3e388;hp=cb42fd58f4aa1ce4b3e7a0aa67c5c06755480ad1;hb=5344832be1126967ff340cf6bd270a377bb8e487;hpb=6a8c2e346e6125e58aab428e6730c18a949abe12

diff --git a/configure.in b/configure.in
index cb42fd58..11d28481 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id: configure.in,v 1.13.2.8 2000/10/13 23:34:56 zarq Exp $
+dnl $Id: configure.in,v 1.13.2.17 2000/11/13 22:01:26 zarq Exp $
 
 AC_INIT(src/tincd.c)
-AM_INIT_AUTOMAKE(tinc, 1.0pre3)
+AM_INIT_AUTOMAKE(tinc, 1.0pre4)
 AM_CONFIG_HEADER(config.h)
 
 dnl Include the macros from the m4/ directory
@@ -46,7 +46,7 @@ dnl Checks for library functions.
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(ftime socket select strtol strerror)
+AC_CHECK_FUNCS(ftime socket select strtol strerror flock unsetenv asprintf)
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
@@ -58,17 +58,7 @@ AC_CHECK_LIB(dl, dlopen, [
 
 
 dnl Crypto stuff
-
-libcrypto=none
-AC_CHECK_LIB(crypto, SHA1_version, [
-  libcrypto=yes
-])
-
-if test $libcrypto = none; then
-  AC_MSG_ERROR(It seems like OpenSSL is not installed on this system.)
-else
-  LIBS="$LIBS -lcrypto"
-fi
+tinc_OPENSSL
 
 
 dnl Support for SunOS
@@ -80,6 +70,16 @@ AC_CHECK_FUNC(gethostbyname, [], [
   AC_CHECK_LIB(nsl, gethostbyname)
 ])
 
+
+dnl Check for TUN/TAP support in the kernel
+tinc_TUNTAP
+
+dnl Check if checkpoint tracing has to be enabled
+AC_ARG_ENABLE(tracing,
+  [  --enable-tracing   enable checkpoint tracing (for debugging purposes only)],
+  [ AC_DEFINE(ENABLE_TRACING) ]
+)
+
 AC_OUTPUT([Makefile src/Makefile
-doc/Makefile intl/Makefile lib/Makefile
+doc/Makefile doc/es/Makefile intl/Makefile lib/Makefile
 m4/Makefile po/Makefile.in redhat/Makefile debian/Makefile])