Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorMichael Veksler <Mihails.Vekslers@zabbix.com>2019-11-23 18:55:11 +0300
committerMichael Veksler <Mihails.Vekslers@zabbix.com>2019-11-23 18:55:11 +0300
commit531eed229c06fee65069e0ac2f952a737cd8bc9b (patch)
tree12d59bdbe5d0aeecc13059db33b453745674baaf /m4
parent224012e8fc6e5c62be4782af1470e37eb02741de (diff)
....I..... [DEV-1343] m4 openssl improvement
Diffstat (limited to 'm4')
-rw-r--r--m4/libopenssl.m417
1 files changed, 9 insertions, 8 deletions
diff --git a/m4/libopenssl.m4 b/m4/libopenssl.m4
index df7f66b3db9..df512fb2ca2 100644
--- a/m4/libopenssl.m4
+++ b/m4/libopenssl.m4
@@ -93,15 +93,16 @@ AC_HELP_STRING([--with-openssl@<:@=DIR@:>@],[use OpenSSL package @<:@default=no@
],[want_openssl=ifelse([$1],,[no],[$1])]
)
- if test "x$enable_static_libs" = "xyes"; then
- test "x$static_linking_support" = "xno" -a -z "$_libopenssl_dir_lib" && AC_MSG_ERROR(["OpenSSL: Compiler not support statically linked libs from default folders"])
- AC_REQUIRE([PKG_PROG_PKG_CONFIG])
- PKG_PROG_PKG_CONFIG()
- test -z $PKG_CONFIG && AC_MSG_ERROR([Not found pkg-config library])
- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
- fi
-
if test "x$want_openssl" = "xyes"; then
+
+ if test "x$enable_static_libs" = "xyes"; then
+ test "x$static_linking_support" = "xno" -a -z "$_libopenssl_dir_lib" && AC_MSG_ERROR(["OpenSSL: Compiler not support statically linked libs from default folders"])
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+ PKG_PROG_PKG_CONFIG()
+ test -z $PKG_CONFIG && AC_MSG_ERROR([Not found pkg-config library])
+ m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
+ fi
+
AC_MSG_CHECKING(for OpenSSL support)
if test "x$_libopenssl_dir" = "xno"; then # if OpenSSL directory is not specified
if test -f /usr/local/include/openssl/ssl.h -a -f /usr/local/include/openssl/crypto.h; then