[SCM] emacs-jabber branch, master, updated. 60ef84029b80210d03ededafa0b038ab7aeda147

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".

The branch, master has been updated
       via  60ef84029b80210d03ededafa0b038ab7aeda147 (commit)
      from  523f5265a2b3a873849955b3775e1d90c2066703 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 60ef84029b80210d03ededafa0b038ab7aeda147
Author: Magnus Henoch <mag...@gm...>
Date:   Tue Feb 26 10:35:12 2013 +0000

    Improve treatment of hexrgb for ELPA package
    
    Include hexrgb.el in jabber-fallback-lib subdirectory, in order not to
    override any already installed version.

diff --git a/Makefile.am b/Makefile.am
index 79cab12..63243f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,20 +24,12 @@ 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
 
-EXTRA_DIST=compat/hexrgb.el
-compat_lisp_sources =
-if USE_OUR_HEXRGB
-compat_lisp_sources += hexrgb.el
-endif
-CLEANFILES=hexrgb.el
-
-hexrgb.el: compat/hexrgb.el
-	cp $< $@
+compat_lisp_sources = jabber-fallback-lib/hexrgb.el
 
 dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoloads.el jabber-ourversion.el
 MAINTAINERCLEANFILES=jabber-autoloads.el
 
-EXTRA_DIST += jabber-pkg.el.in
+EXTRA_DIST = jabber-pkg.el.in
 
 # The autoload file will cause Lisp sources to be rebuilt _twice_: the
 # timestamp of the Lisp compilation is set _before_ the autoloads are
@@ -64,14 +56,14 @@ endif
 
 # Package everything in a form suitable for ELPA.  That is, use
 # "jabber" instead of "emacs-jabber" as base name.
-CLEANFILES += jabber-pkg.el
+CLEANFILES = jabber-pkg.el
 elpa: dist
 	rm -rf emacs-jabber-$(PACKAGE_VERSION) jabber-$(PACKAGE_VERSION)
 	$(AMTAR) xzf emacs-jabber-$(PACKAGE_VERSION).tar.gz
 	mv emacs-jabber-$(PACKAGE_VERSION) jabber-$(PACKAGE_VERSION)
+	rm -rf jabber-$(PACKAGE_VERSION)/tests
 	cd jabber-$(PACKAGE_VERSION) ; install-info jabber.info dir
 	sed "s/@""PACKAGE_VERSION@""/$(PACKAGE_VERSION)/" < $(srcdir)/jabber-pkg.el.in > jabber-$(PACKAGE_VERSION)/jabber-pkg.el
-	mv jabber-$(PACKAGE_VERSION)/compat/*.el jabber-$(PACKAGE_VERSION)/
 	$(AMTAR) chf jabber-$(PACKAGE_VERSION).tar jabber-$(PACKAGE_VERSION)
 	rm -rf jabber-$(PACKAGE_VERSION)
 	@echo "Created jabber-$(PACKAGE_VERSION).tar"
diff --git a/configure.ac b/configure.ac
index ec69320..aba4c5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,10 +6,6 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_PATH_LISPDIR
 AS_IF([test "$EMACS" = no], [AC_MSG_ERROR([cannot find Emacs])])
 
-AX_CHECK_EMACS_LIB([hexrgb], [HAVE_HEXRGB=yes], [HAVE_HEXRGB=no])
-
-AM_CONDITIONAL([USE_OUR_HEXRGB], [test x$HAVE_HEXRGB = xno])
-
 dnl GConf schemas, for registering our URL handler
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
 AM_CONDITIONAL(USE_GCONFTOOL, test "x$GCONFTOOL" != "xno")
diff --git a/compat/hexrgb.el b/jabber-fallback-lib/hexrgb.el
similarity index 100%
rename from compat/hexrgb.el
rename to jabber-fallback-lib/hexrgb.el
diff --git a/jabber-muc-nick-coloring.el b/jabber-muc-nick-coloring.el
index ec4d885..56fe358 100644
--- a/jabber-muc-nick-coloring.el
+++ b/jabber-muc-nick-coloring.el
@@ -20,7 +20,19 @@
 
 ;;; Code:
 
-(require 'hexrgb)                       ;we need hexrgb-hsv-to-hex
+(eval-when-compile (require 'cl))	;for ignore-errors
+;; we need hexrgb-hsv-to-hex:
+(eval-and-compile
+  (or (ignore-errors (require 'hexrgb))
+      ;; jabber-fallback-lib/ from jabber/lisp/jabber-fallback-lib
+      (ignore-errors
+        (let ((load-path (cons (expand-file-name
+                                "jabber-fallback-lib"
+                                (file-name-directory (locate-library "jabber")))
+                               load-path)))
+          (require 'hexrgb)))
+      (error
+       "hexrgb not found in `load-path' or jabber-fallback-lib/ directory.")))
 (require 'assoc)                        ;we need aget/aput
 
 ;;;;##########################################################################

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                               |   16 ++++------------
 configure.ac                              |    4 ----
 {compat => jabber-fallback-lib}/hexrgb.el |    0
 jabber-muc-nick-coloring.el               |   14 +++++++++++++-
 4 files changed, 17 insertions(+), 17 deletions(-)
 rename {compat => jabber-fallback-lib}/hexrgb.el (100%)


hooks/post-receive
-- 
emacs-jabber