emacs-jabber jabber.el, 1.83, 1.84 configure.ac, 1.1, 1.2 Makefile.am, 1.1, 1.2

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

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

Modified Files:
	jabber.el configure.ac Makefile.am 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-480
Creator:  Magnus Henoch <ma...@fr...>

Check for presence of elisp libraries, and include them if missing.  Make it compile with Emacs 21 and 22.


Index: configure.ac
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure.ac	20 Apr 2008 06:21:42 -0000	1.1
+++ configure.ac	20 Apr 2008 11:44:07 -0000	1.2
@@ -1,7 +1,15 @@
 AC_INIT([jabber.el], [0.8.0], [ema...@li...], [emacs-jabber])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-zip])
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_PATH_LISPDIR
 
-AC_CONFIG_FILES([Makefile tests/Makefile])
+AX_CHECK_EMACS_LIB([sha1], [HAVE_SHA1=yes], [HAVE_SHA1=no])
+AX_CHECK_EMACS_LIB([sha1-el], [HAVE_SHA1_EL=yes], [HAVE_SHA1_EL=no])
+AX_CHECK_EMACS_LIB([hex-util], [HAVE_HEX_UTIL=yes], [HAVE_HEX_UTIL=no])
 
+AM_CONDITIONAL([USE_OUR_SHA1], [test x$HAVE_SHA1 = xno -a x$HAVE_SHA1_EL = xno])
+AM_CONDITIONAL([USE_OUR_HEX_UTIL], [test x$HAVE_HEX_UTIL = xno])
+
+AC_CONFIG_FILES([Makefile tests/Makefile])
 AC_OUTPUT

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	20 Apr 2008 06:21:42 -0000	1.1
+++ Makefile.am	20 Apr 2008 11:44:07 -0000	1.2
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 my_lisp_sources=fsm.el jabber-activity.el jabber-ahc-presence.el	\
 jabber-ahc.el jabber-alert.el jabber-autoaway.el jabber-avatar.el	\
 jabber-bookmarks.el jabber-browse.el jabber-chat.el			\
@@ -17,7 +19,15 @@
 jabber-watch.el jabber-widget.el jabber-wmii.el jabber-xmessage.el	\
 jabber-xml.el jabber.el srv.el
 
-dist_lisp_LISP=$(my_lisp_sources) jabber-autoload.el
+compat_lisp_sources =
+if USE_OUR_SHA1
+compat_lisp_sources += compat/sha1.el
+endif
+if USE_OUR_HEX_UTIL
+compat_lisp_sources += compat/hex-util.el
+endif
+
+dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoload.el
 MAINTAINERCLEANFILES=jabber-autoload.el
 
 # The autoload file will cause Lisp sources to be rebuilt _twice_: the

Index: jabber.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- jabber.el	20 Apr 2008 06:21:41 -0000	1.83
+++ jabber.el	20 Apr 2008 11:44:07 -0000	1.84
@@ -152,7 +152,7 @@
 (require 'jabber-wmii)
 (require 'jabber-osd)
 
-(require 'jabber-autoload)
+(load "jabber-autoload")
 
 
 (defvar *jabber-current-status* nil