From 5344832be1126967ff340cf6bd270a377bb8e487 Mon Sep 17 00:00:00 2001 From: Ivo Timmermans Date: Mon, 13 Nov 2000 22:01:27 +0000 Subject: [PATCH] Add a check for openssl that accepts explicit file locations. --- configure.in | 18 ++++------------- m4/openssl.m4 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 14 deletions(-) create mode 100644 m4/openssl.m4 diff --git a/configure.in b/configure.in index 4d5bf9d..11d2848 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.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 @@ -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 @@ -86,7 +76,7 @@ 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 (for debugging purposes only)], [ AC_DEFINE(ENABLE_TRACING) ] ) diff --git a/m4/openssl.m4 b/m4/openssl.m4 new file mode 100644 index 0000000..3fef464 --- /dev/null +++ b/m4/openssl.m4 @@ -0,0 +1,54 @@ +dnl Check to find the OpenSSL headers/libraries + + +AC_DEFUN(tinc_OPENSSL, +[ + + AC_CACHE_CHECK([for openssl], tinc_cv_openssl_include, + [ + AC_ARG_WITH(openssl, + [ --with-openssl=DIR OpenSSL library and headers prefix], + [echo -ne 'prefix...' + openssl_lib="$withval/lib" + openssl_include="$withval/include"] + ) + AC_ARG_WITH(openssl-include, + [ --with-openssl-include=DIR OpenSSL headers directory], + [echo -ne 'includes...' + openssl_include="$withvall"] + ) + AC_ARG_WITH(openssl-lib, + [ --with-openssl-lib=DIR OpenSSL library directory], + [echo -ne 'libraries...' + openssl_lib="$withval"] + ) + +if test "x$openssl_lib" != "x" ; then + LIBS="$LIBS -L$openssl_lib" +fi +if test "x$openssl_include" != "x" ; then + INCLUDES="$INCLUDES -I$openssl_include" +fi + +AC_MSG_RESULT([done.]) + ]) + +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. But perhaps +you need to supply the exact location of the headers and libraries. +You can try running configure with the --with-openssl=/DIRECTORY +parameter. If you installed the headers and libraries in a different +location you can use --with-openssl-include=/DIR and +--with-openssl-lib=/DIR.]) + +else + LIBS="$LIBS -lcrypto" +fi + +]) -- 2.25.1