1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00

Make SASL check also look for libsasl.so if libsasl2.so is missing

This commit is contained in:
Daniel P. Berrange 2009-04-01 10:40:38 +00:00
parent 10467f1c5b
commit ecedb9cef3
2 changed files with 18 additions and 5 deletions

View File

@ -1,3 +1,8 @@
Wed Apr 1 11:40:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
* configure.in: Check for libsasl.so as well as libsasl2.so
since former is used on some OS platforms that aren't Linux
Wed Apr 1 11:38:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
* python/generator.py: Clear internal reference to underlying

View File

@ -516,18 +516,26 @@ if test "x$with_sasl" != "xno"; then
fail=1
fi])
if test "x$with_sasl" != "xno" ; then
AC_CHECK_LIB([sasl2], [sasl_client_init],[with_sasl=yes],[
if test "x$with_sasl" = "xcheck" ; then
AC_CHECK_LIB([sasl2], [sasl_client_init],[
SASL_LIBS="$SASL_LIBS -lsasl2"
with_sasl=yes
],[
AC_CHECK_LIB([sasl], [sasl_client_init],[
SASL_LIBS="$SASL_LIBS -lsasl"
with_sasl=yes
],[
if test "x$with_sasl" = "xcheck" ; then
with_sasl=no
else
else
fail=1
fi])
fi
])
])
fi
test $fail = 1 &&
AC_MSG_ERROR([You must install the Cyrus SASL development package in order to compile libvirt])
CFLAGS="$old_cflags"
LIBS="$old_libs"
SASL_LIBS="$SASL_LIBS -lsasl2"
if test "x$with_sasl" = "xyes" ; then
AC_DEFINE_UNQUOTED([HAVE_SASL], 1,
[whether Cyrus SASL is available for authentication])