mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-01-05 06:31:11 -05:00
Always check SASL compatibility
(Cyrus SASL 2 library may not be called -lsasl2).
This commit is contained in:
parent
856e21296a
commit
82dc573752
2 changed files with 190 additions and 151 deletions
14
configure.in
14
configure.in
|
|
@ -2169,14 +2169,6 @@ if test $ol_with_cyrus_sasl != no ; then
|
|||
[ol_link_sasl="-lsasl"])])
|
||||
fi
|
||||
|
||||
if test $ol_link_sasl = "-lsasl2"; then
|
||||
OL_SASL2_COMPAT
|
||||
|
||||
if test $ol_cv_sasl2_compat = no ; then
|
||||
ol_link_sasl=no
|
||||
AC_MSG_ERROR(SASL: Cyrus SASL2 version obsolete)
|
||||
fi
|
||||
fi
|
||||
if test $ol_link_sasl = no ; then
|
||||
if test $ol_with_cyrus_sasl != auto ; then
|
||||
AC_MSG_ERROR([Could not locate Cyrus SASL])
|
||||
|
|
@ -2188,6 +2180,12 @@ if test $ol_with_cyrus_sasl != no ; then
|
|||
fi
|
||||
fi
|
||||
else
|
||||
OL_SASL2_COMPAT
|
||||
if test $ol_cv_sasl2_compat = no ; then
|
||||
ol_link_sasl=no
|
||||
AC_MSG_ERROR(SASL: Cyrus SASL2 version obsolete)
|
||||
fi
|
||||
|
||||
AC_DEFINE(HAVE_CYRUS_SASL,1,[define if you have Cyrus SASL])
|
||||
SASL_LIBS="$ol_link_sasl"
|
||||
if test $ol_enable_spasswd != no ; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue