projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't #include <alloca.h> anymore.
[tinc]
/
m4
/
openssl.m4
diff --git
a/m4/openssl.m4
b/m4/openssl.m4
index
5d91a78
..
59f0d45
100644
(file)
--- a/
m4/openssl.m4
+++ b/
m4/openssl.m4
@@
-1,36
+1,56
@@
dnl Check to find the OpenSSL headers/libraries
dnl Check to find the OpenSSL headers/libraries
-AC_DEFUN(
tinc_OPENSSL
,
+AC_DEFUN(
[tinc_OPENSSL]
,
[
[
- tinc_ac_save_CPPFLAGS="$CPPFLAGS"
+ AC_ARG_WITH(openssl,
+ AS_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]),
+ [openssl="$withval"
+ CPPFLAGS="$CPPFLAGS -I$withval/include"
+ LDFLAGS="$LDFLAGS -L$withval/lib"]
+ )
AC_ARG_WITH(openssl-include,
AC_ARG_WITH(openssl-include,
-
[ --with-openssl-include=DIR OpenSSL headers directory (without trailing /openssl)]
,
+
AS_HELP_STRING([--with-openssl-include=DIR], [OpenSSL headers directory (without trailing /openssl)])
,
[openssl_include="$withval"
[openssl_include="$withval"
- CFLAGS="$CFLAGS -I$withval"
CPPFLAGS="$CPPFLAGS -I$withval"]
)
AC_ARG_WITH(openssl-lib,
CPPFLAGS="$CPPFLAGS -I$withval"]
)
AC_ARG_WITH(openssl-lib,
-
[ --with-openssl-lib=DIR OpenSSL library directory]
,
+
AS_HELP_STRING([--with-openssl-lib=DIR], [OpenSSL library directory])
,
[openssl_lib="$withval"
[openssl_lib="$withval"
- L
IBS="$LIB
S -L$withval"]
+ L
DFLAGS="$LDFLAG
S -L$withval"]
)
)
- AC_CHECK_HEADERS(openssl/evp.h openssl/rsa.h openssl/rand.h openssl/err.h openssl/sha.h openssl/pem.h,
+ AC_CHECK_HEADERS(openssl/evp.h openssl/rsa.h openssl/rand.h openssl/err.h openssl/sha.h openssl/pem.h
openssl/engine.h
,
[],
[],
- [AC_MSG_ERROR("OpenSSL header files not found."); break]
+ [AC_MSG_ERROR([OpenSSL header files not found.]); break]
+ )
+
+ AC_CHECK_LIB(crypto, EVP_EncryptInit_ex,
+ [LIBS="-lcrypto $LIBS"],
+ [AC_MSG_ERROR([OpenSSL libraries not found.])]
)
)
- CPPFLAGS="$tinc_ac_save_CPPFLAGS"
+case $host_os in
+ *mingw*)
+ ;;
+ *)
+ AC_CHECK_FUNC(dlopen,
+ [],
+ [AC_CHECK_LIB(dl, dlopen,
+ [LIBS="$LIBS -ldl"],
+ [AC_MSG_ERROR([OpenSSL depends on libdl.]); break]
+ )]
+ )
+ ;;
+esac
- AC_CHECK_LIB(crypto, SHA1_version,
- [LIBS="$LIBS -lcrypto"],
- [AC_MSG_ERROR("OpenSSL libraries not found.")]
+ AC_CHECK_FUNCS([RAND_pseudo_bytes EVP_EncryptInit_ex], ,
+ [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break],
)
)
- AC_CHECK_
LIB(dl, dlopen
,
- [
LIBS="$LIBS -ldl"
],
- [
AC_MSG_ERROR("OpenSSL depends on libdl.")
]
+ AC_CHECK_
DECL([OpenSSL_add_all_algorithms],
,
+ [
AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break
],
+ [
#include <openssl/evp.h>
]
)
])
)
])