diff options
| author | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2019-11-27 18:55:40 +0300 |
|---|---|---|
| committer | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2019-11-27 18:55:40 +0300 |
| commit | 61989d832d9c4c67ce47e7cc4dba6b5847588819 (patch) | |
| tree | 2e19c1787e585f87c22c8b7c128b418cd88c04b5 /m4 | |
| parent | 30b0c52e64fa8d5110cb71fe87f13d4cb0d3f355 (diff) | |
....I..... [DEV-1343] m4 openssl minor improvements
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/libopenssl.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/libopenssl.m4 b/m4/libopenssl.m4 index 8de602680c5..69deaac4cc1 100644 --- a/m4/libopenssl.m4 +++ b/m4/libopenssl.m4 @@ -143,15 +143,15 @@ AC_HELP_STRING([--with-openssl@<:@=DIR@:>@],[use OpenSSL package @<:@default=no@ if test "x$enable_static_libs" = "xyes" -a -z "$PKG_CONFIG"; then OPENSSL_LIBS="$_libopenssl_dir_lib/libssl.a $_libopenssl_dir_lib/libcrypto.a" elif test "x$enable_static_libs" = "xyes"; then - if test "x$_libopenssl_dir" = "xno" -o -z "$_libopenssl_dir"; then + if test -z "$_libopenssl_dir_lib"; then PKG_CHECK_EXISTS(openssl,[ OPENSSL_LIBS=`$PKG_CONFIG --static --libs openssl` ],[ AC_MSG_ERROR([Not found openssl package]) ]) else - AC_RUN_LOG([PKG_CONFIG_LIBDIR="$_libopenssl_dir/lib/pkgconfig" $PKG_CONFIG --exists --print-errors openssl]) || AC_MSG_ERROR(["Not found openssl package in $_libopenssl_dir/lib/pkgconfig"]) - OPENSSL_LIBS=`PKG_CONFIG_LIBDIR="$_libopenssl_dir/lib/pkgconfig" $PKG_CONFIG --static --libs openssl` + AC_RUN_LOG([PKG_CONFIG_LIBDIR="$_libopenssl_dir_lib/pkgconfig" $PKG_CONFIG --exists --print-errors openssl]) || AC_MSG_ERROR(["Not found openssl package in $_libopenssl_dir/lib/pkgconfig"]) + OPENSSL_LIBS=`PKG_CONFIG_LIBDIR="$_libopenssl_dir_lib/pkgconfig" $PKG_CONFIG --static --libs openssl` fi if test "x$static_linking_support" = "xno"; then |