Identify version as 1.0pre4-cvs

[oweals/tinc.git] / configure.in

diff --git a/configure.in b/configure.in
index bc01f1751ae5f2e13e620181ec42adeb79c813ee..368908a0068c55fd8a25dc6e026f11a97fd7bb86 100644 (file)
--- 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.9 2000/10/15 17:26:31 zarq Exp $
+dnl $Id: configure.in,v 1.13.2.18 2000/11/13 22:29:22 zarq Exp $
 
 AC_INIT(src/tincd.c)
-AM_INIT_AUTOMAKE(tinc, 1.0pre3)
+AM_INIT_AUTOMAKE(tinc, 1.0pre4-cvs)
 AM_CONFIG_HEADER(config.h)
 
 dnl Include the macros from the m4/ directory
@@ -33,7 +33,7 @@ dnl Checks for libraries.
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h syslog.h unistd.h sys/time.h linux/if_tun.h)
+AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h syslog.h unistd.h sys/time.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -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
@@ -84,6 +74,12 @@ AC_CHECK_FUNC(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])