From: Ivo Timmermans Date: Tue, 14 Nov 2000 22:57:19 +0000 (+0000) Subject: Better checks for OpenSSL. I think it can now detect almost all conceivable installa... X-Git-Tag: release-1.0pre4~183 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=9ddb37cee0f754ef88a55f692a508010fe18c782;p=tinc Better checks for OpenSSL. I think it can now detect almost all conceivable installations. --- diff --git a/m4/openssl.m4 b/m4/openssl.m4 index 3fef464b..d933b23b 100644 --- a/m4/openssl.m4 +++ b/m4/openssl.m4 @@ -3,49 +3,76 @@ 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], + [openssl_lib="$withval/lib" + openssl_include="$withval/include"] + ) + AC_CACHE_CHECK([for openssl headers], 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"] + [tinc_cv_openssl_include="$withval"], + [if test "x$openssl_include" = "x" ; then + tinc_cv_openssl_include="none given" + else + tinc_cv_openssl_include=$openssl_include + fi] ) + ]) + AC_CACHE_CHECK([for openssl libraries], tinc_cv_openssl_lib, + [ AC_ARG_WITH(openssl-lib, [ --with-openssl-lib=DIR OpenSSL library directory], - [echo -ne 'libraries...' - openssl_lib="$withval"] + [tinc_cv_openssl_lib="$withval"], + [if test "x$openssl_lib" = "x" ; then + tinc_cv_openssl_lib="none given" + else + tinc_cv_openssl_lib=$openssl_lib + fi] ) + ]) -if test "x$openssl_lib" != "x" ; then - LIBS="$LIBS -L$openssl_lib" +if test "$openssl_lib" != "none given" ; then + LIBS="$LIBS -L$tinc_cv_openssl_lib" fi -if test "x$openssl_include" != "x" ; then - INCLUDES="$INCLUDES -I$openssl_include" +if test "$openssl_include" != "none given" ; then + INCLUDES="$INCLUDES -I$tinc_cv_openssl_include" +fi + +osi=none +AC_CHECK_HEADERS(evp.h rsa.h, +[osi=found + break]) + +if test "$osi" = "none" ; then + AC_CHECK_HEADERS(openssl/evp.h openssl/rsa.h, + [osi=found + break]) fi -AC_MSG_RESULT([done.]) - ]) libcrypto=none -AC_CHECK_LIB(crypto, SHA1_version, [ - libcrypto=yes -]) + +if test "$osi" = "found" ; then + AC_CHECK_LIB(crypto, SHA1_version, [ + libcrypto=yes + ]) +fi if test $libcrypto = none; then - AC_MSG_ERROR( -[It seems like OpenSSL is not installed on this system. But perhaps +cat <