diff options
| author | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2019-11-15 17:17:04 +0300 |
|---|---|---|
| committer | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2019-11-15 17:17:36 +0300 |
| commit | 8277c4f32b80b64b3b756a352dae959fe7eff7a1 (patch) | |
| tree | 86f02536082ff9a49d9ae0922a84b87c247dfd3a /m4 | |
| parent | 81a87bf5037865994b495175fe9d16d94093d8c6 (diff) | |
....I..... [DEV-1343] openssl, pcre and curl m4 improvements
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/libcurl.m4 | 13 | ||||
| -rw-r--r-- | m4/libopenssl.m4 | 4 | ||||
| -rw-r--r-- | m4/pcre.m4 | 4 |
3 files changed, 15 insertions, 6 deletions
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4 index 9d4c8f493ce..7cc3c3f69e1 100644 --- a/m4/libcurl.m4 +++ b/m4/libcurl.m4 @@ -150,8 +150,17 @@ AC_HELP_STRING([--with-libcurl@<:@=DIR@:>@],[use cURL package @<:@default=no@:>@ AC_CHECK_LIB($_lib_name , main,[ if test "x$enable_static_libs" = "xyes"; then case $i in - -lssl|-lcrypto|-lssl_a|-lcrypto_a) - i="-Wl,-Bstatic $i -Wl,-Bdynamic -ldl" + -lssl|-lcrypto) + test "x$want_openssl" = "xyes" && i="-Wl,-Bstatic $i -Wl,-Bdynamic -ldl" + ;; + -lldap|-lldap_r|-llber) + test "x$want_ldap" = "xyes" && i="-Wl,-Bstatic $i -Wl,-Bdynamic" + ;; + -lssl_a|-lcrypto_a) + test "x$want_openssl" = "xyes" && i="-Wl,-Bstatic $i -Wl,-Bdynamic" + ;; + -lldap_a|-lldap_r_a|-llber_a) + test "x$want_ldap" = "xyes" && i="-Wl,-Bstatic $i -Wl,-Bdynamic" ;; esac fi diff --git a/m4/libopenssl.m4 b/m4/libopenssl.m4 index 5132946e760..d30d60e49b4 100644 --- a/m4/libopenssl.m4 +++ b/m4/libopenssl.m4 @@ -140,10 +140,10 @@ AC_HELP_STRING([--with-openssl@<:@=DIR@:>@],[use OpenSSL package @<:@default=no@ PKG_CHECK_EXISTS(openssl,[ OPENSSL_LIBS=`$PKG_CONFIG --static --libs openssl` ],[ - AC_MSG_ERROR([Not found openssl library]) + 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 library]) + 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 diff --git a/m4/pcre.m4 b/m4/pcre.m4 index 95e5991bb91..4211fb1cc8f 100644 --- a/m4/pcre.m4 +++ b/m4/pcre.m4 @@ -77,10 +77,10 @@ AC_HELP_STRING([--with-libpcre@<:@=DIR@:>@], [use libpcre from given base instal PKG_CHECK_EXISTS(libpcre,[ LIBPCRE_LIBS=`$PKG_CONFIG --static --libs libpcre` ],[ - AC_MSG_ERROR([Not found libpcre library]) + AC_MSG_ERROR([Not found libpcre package]) ]) else - AC_RUN_LOG([PKG_CONFIG_LIBDIR="$_libpcre_dir/lib/pkgconfig" $PKG_CONFIG --exists --print-errors libpcre]) || AC_MSG_ERROR([Not found libpcre library]) + AC_RUN_LOG([PKG_CONFIG_LIBDIR="$_libpcre_dir/lib/pkgconfig" $PKG_CONFIG --exists --print-errors libpcre]) || AC_MSG_ERROR(["Not found libpcre package in $_libpcre_dir/lib/pkgconfig"]) LIBPCRE_LIBS=`PKG_CONFIG_LIBDIR="$_libpcre_dir/lib/pkgconfig" $PKG_CONFIG --static --libs libpcre` fi |