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-12-06 18:58:16 +0300
committerMichael Veksler <Mihails.Vekslers@zabbix.com>2019-12-06 18:58:16 +0300
commit24384a71f8f42ece95824002a2a8720e48d9685e (patch)
treec06ef34a7cd3f29ce2fb118806e1e2eefab6def7 /m4
parent1b3d18c58d1d97dc3bc619e674375f1ee62a461e (diff)
....I..... [DEV-1343] m4 ldap support without SSL and SASL
Diffstat (limited to 'm4')
-rw-r--r--m4/ldap.m419
1 files changed, 16 insertions, 3 deletions
diff --git a/m4/ldap.m4 b/m4/ldap.m4
index 051429be882..ebf9211dcbc 100644
--- a/m4/ldap.m4
+++ b/m4/ldap.m4
@@ -123,17 +123,30 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:>
LDAP_LIBS=`echo "$LDAP_LIBS"|sed "s|-lldap|$_ldap_dir_lib/libldap.a|g"|sed "s|-llber|$_ldap_dir_lib/liblber.a|g"`
fi
- # without SSL
+ # without SSL and SASL
if test "x$static_linking_support" = "xno"; then
- TRY_LDAP_LIBS="$LDAP_LIBS -lpthread -lsasl2"
+ TRY_LDAP_LIBS="$LDAP_LIBS -lpthread"
else
- TRY_LDAP_LIBS="${static_linking_support}static $LDAP_LIBS ${static_linking_support}dynamic -lpthread -lsasl2"
+ TRY_LDAP_LIBS="${static_linking_support}static $LDAP_LIBS ${static_linking_support}dynamic -lpthread"
fi
LIBLDAP_TRY_LINK([$TRY_LDAP_LIBS], [$LDAP_LDFLAGS], [$LDAP_CPPFLAGS], ,[
LDAP_LIBS=$TRY_LDAP_LIBS
AC_MSG_RESULT([without SSL])
])
+ # without SSL
+ if test "x$ldap_link" = "xno"; then
+ if test "x$static_linking_support" = "xno"; then
+ TRY_LDAP_LIBS="$LDAP_LIBS -lpthread -lsasl2"
+ else
+ TRY_LDAP_LIBS="${static_linking_support}static $LDAP_LIBS ${static_linking_support}dynamic -lpthread -lsasl2"
+ fi
+ LIBLDAP_TRY_LINK([$TRY_LDAP_LIBS], [$LDAP_LDFLAGS], [$LDAP_CPPFLAGS], ,[
+ LDAP_LIBS=$TRY_LDAP_LIBS
+ AC_MSG_RESULT([without SSL])
+ ])
+ fi
+
# without SSL for Solaris
if test "x$ldap_link" = "xno"; then
if test "x$static_linking_support" = "xno"; then