emacs-jabber jabber-autoloads.stub, NONE, 1.1 jabber.el, 1.88, 1.89 Makefile.am, 1.6, 1.7

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

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

Modified Files:
	jabber.el Makefile.am 
Added Files:
	jabber-autoloads.stub 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-535
Creator:  Magnus Henoch <ma...@fr...>

Fix building of jabber-autoloads under Emacs 21

Also, ensure that it does (provide 'jabber-autoloads), which lets us use
`require'.


--- NEW FILE: jabber-autoloads.stub ---
;;; jabber-autoloads.el --- automatically extracted autoloads
;;
;;; Code:


(provide 'jabber-autoloads)
;; Local Variables:
;; version-control: never
;; no-byte-compile: t
;; no-update-autoloads: t
;; End:
;;; jabber-autoloads.el ends here

Index: jabber.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- jabber.el	30 May 2008 20:43:29 -0000	1.88
+++ jabber.el	17 Jun 2008 14:49:20 -0000	1.89
@@ -153,7 +153,7 @@
 (require 'jabber-wmii)
 (require 'jabber-osd)
 
-(load "jabber-autoloads")
+(require 'jabber-autoloads)
 
 
 (defvar *jabber-current-status* nil

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	1 Jun 2008 22:54:45 -0000	1.6
+++ Makefile.am	17 Jun 2008 14:49:21 -0000	1.7
@@ -40,7 +40,11 @@
 # regenerated, which means that jabber-autoload.el is once again
 # considered new, which means that everything will be built again.
 # Suggestions welcome.
+#
+# Emacs 21 requires that the file already exist and have non-zero
+# size, so we touch it with ancient timestamp.
 jabber-autoloads.el: $(my_lisp_sources)
+	test -s $@ || cp -f $(srcdir)/jabber-autoloads.stub $@; touch -t 197001030000 $@
 	$(EMACS) --batch --eval "(setq generated-autoload-file \"$(abs_builddir)/$@\")" -f batch-update-autoloads $(srcdir)
 
 info_TEXINFOS=jabber.texi