projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cosmetic fix when pressing 's' in tincctl top.
[tinc]
/
m4
/
openssl.m4
diff --git
a/m4/openssl.m4
b/m4/openssl.m4
index
32e41de
..
59f0d45
100644
(file)
--- a/
m4/openssl.m4
+++ b/
m4/openssl.m4
@@
-1,50
+1,40
@@
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,
AC_ARG_WITH(openssl,
- A
C
_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]),
+ A
S
_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]),
[openssl="$withval"
[openssl="$withval"
- CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include"
- L
IBS="$LIB
S -L$withval/lib"]
+ L
DFLAGS="$LDFLAG
S -L$withval/lib"]
)
AC_ARG_WITH(openssl-include,
)
AC_ARG_WITH(openssl-include,
- A
C
_HELP_STRING([--with-openssl-include=DIR], [OpenSSL headers directory (without trailing /openssl)]),
+ A
S
_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,
- A
C
_HELP_STRING([--with-openssl-lib=DIR], [OpenSSL library directory]),
+ A
S
_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]
)
- CPPFLAGS="$tinc_ac_save_CPPFLAGS"
+ AC_CHECK_LIB(crypto, EVP_EncryptInit_ex,
+ [LIBS="-lcrypto $LIBS"],
+ [AC_MSG_ERROR([OpenSSL libraries not found.])]
+ )
case $host_os in
*mingw*)
case $host_os in
*mingw*)
- AC_CHECK_LIB(crypto, SHA1_version,
- [LIBS="$LIBS -lcrypto -lgdi32"],
- [AC_MSG_ERROR([OpenSSL libraries not found.])]
- )
;;
*)
;;
*)
- AC_CHECK_LIB(crypto, SHA1_version,
- [LIBS="$LIBS -lcrypto"],
- [AC_MSG_ERROR([OpenSSL libraries not found.])]
- )
-
AC_CHECK_FUNC(dlopen,
[],
[AC_CHECK_LIB(dl, dlopen,
AC_CHECK_FUNC(dlopen,
[],
[AC_CHECK_LIB(dl, dlopen,