X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=m4%2Fopenssl.m4;h=2d24258c7ad7fdf36f1fb719d7c6a9ecf356f844;hp=d933b23bb59b505c84f3c47fb6d5675ff74f5a24;hb=bc22ee16e6903d2caf9d22afa85020d1e3e10b56;hpb=9ddb37cee0f754ef88a55f692a508010fe18c782

diff --git a/m4/openssl.m4 b/m4/openssl.m4
index d933b23b..2d24258c 100644
--- a/m4/openssl.m4
+++ b/m4/openssl.m4
@@ -33,22 +33,21 @@ AC_DEFUN(tinc_OPENSSL,
     )
   ])
 
-if test "$openssl_lib" != "none given" ; then
+if test "$tinc_cv_openssl_lib" != "none given" ; then
   LIBS="$LIBS -L$tinc_cv_openssl_lib"
 fi
-if test "$openssl_include" != "none given" ; then
-  INCLUDES="$INCLUDES -I$tinc_cv_openssl_include"
+if test "$tinc_cv_openssl_include" != "none given" ; then
+  CFLAGS="$CFLAGS -I$tinc_cv_openssl_include"
 fi
 
-osi=none
-AC_CHECK_HEADERS(evp.h rsa.h,
-[osi=found
- break])
+osi=found
+AC_CHECK_HEADERS(evp.h rsa.h rand.h err.h sha.h pem.h,
+[], [osi=none; break])
 
 if test "$osi" = "none" ; then
-  AC_CHECK_HEADERS(openssl/evp.h openssl/rsa.h,
-  [osi=found
-   break])
+  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