From: Will Fiveash <Will.Fiveash@Sun.COM>
Date: Mon, 8 Mar 2010 20:04:23 +0000 (-0600)
Subject: OpenSolaris sasl fix for configure.ac
X-Git-Tag: mutt-1-5-21-rel~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f395807c549044dd6cc78c097ddc43bc8065efe;p=mutt

OpenSolaris sasl fix for configure.ac
---

diff --git a/configure.ac b/configure.ac
index 60d5757d..24f2cb0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -718,7 +718,7 @@ fi
 
 AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
 
-AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl@<:@=PFX@:>@], [Use Cyrus SASL 2 network security library]),
+AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl@<:@=PFX@:>@], [Use SASL network security library]),
         [	
         if test "$with_sasl" != "no"
         then
@@ -734,15 +734,18 @@ AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl@<:@=PFX@:>@], [Use Cyrus SASL 2 ne
           fi
 
           saved_LIBS="$LIBS"
+          LIBS=
 
-          AC_CHECK_LIB(sasl2, sasl_client_init,,
-            AC_MSG_ERROR([could not find libsasl2]),)
+          sasl_libs="sasl2 sasl"
+          AC_SEARCH_LIBS(sasl_encode64, [$sasl_libs],,
+                  AC_MSG_ERROR([could not find sasl lib]),)
 
+          MUTTLIBS="$MUTTLIBS $LIBS"
           MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o"
-          MUTTLIBS="$MUTTLIBS -lsasl2"
           LIBS="$saved_LIBS"
+
           AC_DEFINE(USE_SASL,1,
-                  [ Define if want to use the Cyrus SASL library for POP/IMAP authentication. ])
+                  [ Define if want to use the SASL library for POP/IMAP authentication. ])
           need_sasl=yes
         fi
         ])