emacs-jabber jabber-core.el,1.50,1.51 jabber-sasl.el,2.8,2.9

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8373

Modified Files:
	jabber-core.el jabber-sasl.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-348
Creator:  Magnus Henoch <ma...@fr...>

Don't use compilation failure to detect non-support for SASL


Index: jabber-sasl.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-sasl.el,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -d -r2.8 -r2.9
*** jabber-sasl.el	9 Apr 2007 16:37:33 -0000	2.8
--- jabber-sasl.el	22 Apr 2007 10:26:42 -0000	2.9
***************
*** 21,27 ****
  (require 'cl)
  
! ;;; This file uses sasl.el from FLIM, and expects to find it.  If it
! ;;; can't be found, jabber-core.el catches the error.
! (require 'sasl)
  
  ;;; Alternatives to FLIM would be the command line utility of GNU SASL,
--- 21,30 ----
  (require 'cl)
  
! ;;; This file uses sasl.el from FLIM or Gnus.  If it can't be found,
! ;;; jabber-core.el won't use the SASL functions.
! (eval-and-compile
!   (condition-case nil
!       (require 'sasl)
!     (error nil)))
  
  ;;; Alternatives to FLIM would be the command line utility of GNU SASL,

Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** jabber-core.el	20 Mar 2007 16:13:41 -0000	1.50
--- jabber-core.el	22 Apr 2007 10:26:42 -0000	1.51
***************
*** 30,38 ****
  (require 'fsm)
  
! ;; SASL depends on FLIM.
! (eval-and-compile
!   (condition-case nil
!       (require 'jabber-sasl)
!     (error nil)))
  
  (defvar jabber-connections nil
--- 30,34 ----
  (require 'fsm)
  
! (require 'jabber-sasl)
  
  (defvar jabber-connections nil
***************
*** 120,124 ****
  (defsubst jabber-have-sasl-p ()
    "Return non-nil if SASL functions are available."
!   (fboundp 'jabber-sasl-start-auth))
  
  (defun jabber-connect (username server resource &optional registerp)
--- 116,120 ----
  (defsubst jabber-have-sasl-p ()
    "Return non-nil if SASL functions are available."
!   (featurep 'sasl))
  
  (defun jabber-connect (username server resource &optional registerp)