Prefer fsm.el from ELPA

fsm.el is now in GNU ELPA, so let's use it if it's installed.  Also,
let the jabber package depend on it.

Keep a copy in jabber-fallback-lib directory, and use it if necessary.
Notably, this one is still compatible with Emacs 23.

Makefile.am

@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
 # for options in configure.ac.
 AUTOMAKE_OPTIONS = 1.11
 
-my_lisp_sources=fsm.el jabber-activity.el jabber-ahc-presence.el	\
+my_lisp_sources=jabber-activity.el jabber-ahc-presence.el		\
 jabber-ahc.el jabber-alert.el jabber-autoaway.el jabber-avatar.el	\
 jabber-awesome.el jabber-ping.el jabber-libnotify.el jabber-console.el	\
 jabber-notifications.el							\
@@ -25,7 +25,7 @@ jabber-watch.el jabber-widget.el jabber-wmii.el jabber-xmessage.el	\
 jabber-muc-nick-coloring.el						\
 jabber-xml.el jabber.el srv.el jabber-tmux.el jabber-ourversion.el
 
-compat_lisp_sources = jabber-fallback-lib/hexrgb.el
+compat_lisp_sources = jabber-fallback-lib/hexrgb.el jabber-fallback-lib/fsm.el
 
 dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoloads.el
 MAINTAINERCLEANFILES=jabber-autoloads.el

jabber-core.el

@@ -27,7 +27,16 @@
 (require 'jabber-util)
 (require 'jabber-logon)
 (require 'jabber-conn)
-(require 'fsm)
+(eval-and-compile
+  (or (ignore-errors (require 'fsm))
+      (ignore-errors
+        (let ((load-path (cons (expand-file-name
+                                "jabber-fallback-lib"
+                                (file-name-directory (locate-library "jabber")))
+                               load-path)))
+          (require 'fsm)))
+      (error
+       "fsm not found in `load-path' or jabber-fallback-lib/ directory.")))
 
 (require 'jabber-sasl)
 (require 'jabber-console)

jabber-pkg.el.in

@@ -1,4 +1,5 @@
 ;; For ELPA: http://tromey.com/elpa/
-(define-package "jabber" "@PACKAGE_VERSION@" "A Jabber client for Emacs.")
+(define-package "jabber" "@PACKAGE_VERSION@" "A Jabber client for Emacs."
+  '((fsm "0.2")))
 
 ;; arch-tag: fa652136-12f7-11dd-b4c4-000a95c2fcd0

jabber-socks5.el

@@ -24,7 +24,8 @@
 (require 'jabber-si-server)
 (require 'jabber-si-client)
 
-(require 'fsm)
+;; jabber-core will require fsm for us
+(require 'jabber-core)
 (eval-when-compile (require 'cl))
 
 (defvar jabber-socks5-pending-sessions nil