From db18ce44156b6d9a19e993f4eeb33a1c382b18df Mon Sep 17 00:00:00 2001
From: Magnus Henoch <mange@freemail.hu>
Date: Tue, 17 Jun 2008 14:49:20 +0000
Subject: [PATCH] Revision:
 mange@freemail.hu--2005/emacs-jabber--cvs-head--0--patch-535 Creator:  Magnus
 Henoch <mange@freemail.hu>

Fix building of jabber-autoloads under Emacs 21

Also, ensure that it does (provide 'jabber-autoloads), which lets us use
`require'.
---
 Makefile.am           |  4 ++++
 jabber-autoloads.stub | 12 ++++++++++++
 jabber.el             |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 jabber-autoloads.stub

diff --git a/Makefile.am b/Makefile.am
index c9d04a0..df4e786 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,11 @@ EXTRA_DIST = jabber-pkg.el.in
 # 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
diff --git a/jabber-autoloads.stub b/jabber-autoloads.stub
new file mode 100644
index 0000000..1701018
--- /dev/null
+++ b/jabber-autoloads.stub
@@ -0,0 +1,12 @@
+;;; 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
diff --git a/jabber.el b/jabber.el
index 3db9868..c64692a 100644
--- a/jabber.el
+++ b/jabber.el
@@ -153,7 +153,7 @@ configure a Google Talk account like this:
 (require 'jabber-wmii)
 (require 'jabber-osd)
 
-(load "jabber-autoloads")
+(require 'jabber-autoloads)
 
 
 (defvar *jabber-current-status* nil