Use srv.el from package repository
srv.el is now a separate package in MELPA, so let's depend on that. Keep a copy in jabber-fallback-lib for the time being.
This commit is contained in:
parent
7fb313c259
commit
fff33826f4
|
@ -23,9 +23,10 @@ jabber-time.el jabber-truncate.el jabber-util.el \
|
||||||
jabber-vcard-avatars.el jabber-vcard.el jabber-version.el \
|
jabber-vcard-avatars.el jabber-vcard.el jabber-version.el \
|
||||||
jabber-watch.el jabber-widget.el jabber-wmii.el jabber-xmessage.el \
|
jabber-watch.el jabber-widget.el jabber-wmii.el jabber-xmessage.el \
|
||||||
jabber-muc-nick-coloring.el \
|
jabber-muc-nick-coloring.el \
|
||||||
jabber-xml.el jabber.el srv.el jabber-tmux.el jabber-ourversion.el
|
jabber-xml.el jabber.el jabber-tmux.el jabber-ourversion.el
|
||||||
|
|
||||||
compat_lisp_sources = jabber-fallback-lib/hexrgb.el jabber-fallback-lib/fsm.el
|
compat_lisp_sources = jabber-fallback-lib/hexrgb.el jabber-fallback-lib/fsm.el \
|
||||||
|
jabber-fallback-lib/srv.el
|
||||||
|
|
||||||
dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoloads.el
|
dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoloads.el
|
||||||
MAINTAINERCLEANFILES=jabber-autoloads.el
|
MAINTAINERCLEANFILES=jabber-autoloads.el
|
||||||
|
|
|
@ -36,7 +36,16 @@
|
||||||
|
|
||||||
(ignore-errors (require 'starttls))
|
(ignore-errors (require 'starttls))
|
||||||
|
|
||||||
(require 'srv)
|
(eval-and-compile
|
||||||
|
(or (ignore-errors (require 'srv))
|
||||||
|
(ignore-errors
|
||||||
|
(let ((load-path (cons (expand-file-name
|
||||||
|
"jabber-fallback-lib"
|
||||||
|
(file-name-directory (locate-library "jabber")))
|
||||||
|
load-path)))
|
||||||
|
(require 'srv)))
|
||||||
|
(error
|
||||||
|
"srv not found in `load-path' or jabber-fallback-lib/ directory.")))
|
||||||
|
|
||||||
(defgroup jabber-conn nil "Jabber Connection Settings"
|
(defgroup jabber-conn nil "Jabber Connection Settings"
|
||||||
:group 'jabber)
|
:group 'jabber)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
;; For ELPA: http://tromey.com/elpa/
|
;; 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")))
|
'((fsm "0.2") (srv "0.2")))
|
||||||
|
|
||||||
;; arch-tag: fa652136-12f7-11dd-b4c4-000a95c2fcd0
|
;; arch-tag: fa652136-12f7-11dd-b4c4-000a95c2fcd0
|
||||||
|
|
Loading…
Reference in New Issue