From ecedb9cef306d91f79c6819fb27300713b0db6d0 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 1 Apr 2009 10:40:38 +0000 Subject: [PATCH] Make SASL check also look for libsasl.so if libsasl2.so is missing --- ChangeLog | 5 +++++ configure.in | 18 +++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d213797636..f9c0f997b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Apr 1 11:40:22 BST 2009 Daniel P. Berrange + + * 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 * python/generator.py: Clear internal reference to underlying diff --git a/configure.in b/configure.in index 6b2bb5e0d2..c5fe0b0711 100644 --- a/configure.in +++ b/configure.in @@ -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])