Add a check for openssl that accepts explicit file locations.

[tinc] / configure.in

diff --git a/configure.in b/configure.in
index 4d5bf9d..11d2848 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 
 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.17 2000/11/13 22:01:26 zarq Exp $

 
 AC_INIT(src/tincd.c)
 
 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
 AM_CONFIG_HEADER(config.h)
 
 dnl Include the macros from the m4/ directory


@@ -58,17 +58,7 @@ AC_CHECK_LIB(dl, dlopen, [
 
 
 dnl Crypto stuff
 
 
 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
 
 
 dnl Support for SunOS


@@ -86,7 +76,7 @@ tinc_TUNTAP
 
 dnl Check if checkpoint tracing has to be enabled
 AC_ARG_ENABLE(tracing,
 
 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 (for debugging purposes only)],

   [ AC_DEFINE(ENABLE_TRACING) ]
 )
 
   [ AC_DEFINE(ENABLE_TRACING) ]
 )