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

diff --git a/ChangeLog b/ChangeLog
index d213797636f1ea0fe58878f536de6d59a5265605..f9c0f997b650ca6b64e252c442fe2c39aea00f9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/configure.in b/configure.in
index 6b2bb5e0d2faf0ffd46ae26715014c2965b3b538..c5fe0b0711322f603d881dcaaa78340bdd5f983d 100644 (file)
--- 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])