From: Guus Sliepen Date: Thu, 7 Jun 2001 07:51:04 +0000 (+0000) Subject: Changed drastically because it didn't work correctly: X-Git-Tag: release-1.0pre5~124 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=c5c02a0861bf540e07fe64704cb97aae29c4cacf;p=tinc Changed drastically because it didn't work correctly: - Don't cache the --with-openssl-* option arguments - Only search for openssl/*.h, the openssl include files include other files only from an openssl/ directory too - Set CPPFLAGS before AC_CHECK_HEADERS --- diff --git a/m4/openssl.m4 b/m4/openssl.m4 index 2d24258c..bf5ce9fc 100644 --- a/m4/openssl.m4 +++ b/m4/openssl.m4 @@ -1,80 +1,31 @@ dnl Check to find the OpenSSL headers/libraries - AC_DEFUN(tinc_OPENSSL, [ - 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-include, - [ --with-openssl-include=DIR OpenSSL headers directory], - [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], - [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] - ) - ]) + tinc_ac_save_CPPFLAGS="$CPPFLAGS" -if test "$tinc_cv_openssl_lib" != "none given" ; then - LIBS="$LIBS -L$tinc_cv_openssl_lib" -fi -if test "$tinc_cv_openssl_include" != "none given" ; then - CFLAGS="$CFLAGS -I$tinc_cv_openssl_include" -fi + AC_ARG_WITH(openssl-include, + [ --with-openssl-include=DIR OpenSSL headers directory (without trailing /openssl)], + [openssl_include="$withval" + CFLAGS="$CFLAGS -I$withval" + CPPFLAGS="$CPPFLAGS -I$withval"] + ) -osi=found -AC_CHECK_HEADERS(evp.h rsa.h rand.h err.h sha.h pem.h, -[], [osi=none; break]) + AC_ARG_WITH(openssl-lib, + [ --with-openssl-lib=DIR OpenSSL library directory], + [openssl_lib="$withval" + LIBS="$LIBS -L$withval"] + ) -if test "$osi" = "none" ; then - osi=found AC_CHECK_HEADERS(openssl/evp.h openssl/rsa.h openssl/rand.h openssl/err.h openssl/sha.h openssl/pem.h, - [], [osi=none; break]) -fi - - -libcrypto=none - -if test "$osi" = "found" ; then - AC_CHECK_LIB(crypto, SHA1_version, [ - libcrypto=yes - ]) -fi - -if test $libcrypto = none; then -cat <