X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=configure.in;h=d4b61e6d777d8c08a05f19110b2c0e31d442e607;hp=4d5bf9dd491b7645752d7c5c541fea85cbdc4beb;hb=2ed68134047a19e708c2a2af32c58968835a7043;hpb=16847ea255fa8a7c0ed922af80a2f36b7bdf4b3b

diff --git a/configure.in b/configure.in
index 4d5bf9dd..d4b61e6d 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.16 2000/11/08 20:52:36 guus Exp $
+dnl $Id: configure.in,v 1.13.2.20 2000/11/20 19:56:01 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
@@ -25,7 +25,7 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 jm_PERL
-AM_PROG_LIBTOOL
+
 
 AC_ISC_POSIX
 
@@ -33,7 +33,8 @@ 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)
+AC_CHECK_HEADERS([fcntl.h limits.h sys/ioctl.h syslog.h unistd.h \
+sys/time.h malloc.h strings.h sys/file.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -46,7 +47,8 @@ dnl Checks for library functions.
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(ftime socket select strtol strerror flock unsetenv asprintf)
+AC_CHECK_FUNCS([ftime socket select strtol strerror flock unsetenv \
+asprintf putenv strdup])
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
@@ -58,17 +60,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
@@ -86,10 +78,12 @@ tinc_TUNTAP
 
 dnl Check if checkpoint tracing has to be enabled
 AC_ARG_ENABLE(tracing,
-  --enable-tracing	enable checkpoint tracing (for debugging purposes only),
+  [  --enable-tracing        enable checkpoint tracing (debugging only)],
   [ AC_DEFINE(ENABLE_TRACING) ]
 )
 
+AC_SUBST(INCLUDES)
+
 AC_OUTPUT([Makefile src/Makefile
 doc/Makefile doc/es/Makefile intl/Makefile lib/Makefile
 m4/Makefile po/Makefile.in redhat/Makefile debian/Makefile])