Re: Building emacs with and without X -- packaging question.

[Rob Browning <rlb@defaultvalue.org>]

Rob Browning <rlb@defaultvalue.org> writes:

>   2) to fix the problem with gnus-art.el's
>      gnus-article-x-face-command, I copy-pasted the code that
>      initializes gnus-article-compface-xbm from gnus-ems.el.  Can
>      anyone see a problem with that as a short-term solution?  (The
>      diff is below.)

I've modified the diff a little to try and make it even more
defensive.  Now gnus-article-x-face-command's defcustom uses
gnus-article-compface-xbm's definition if bound, and the copy/pasted
initialization from gnus-article-compface-xbm's defvar in gnus-ems.el
otherwise.

This seems unlikely to cause serious problems, and fixes the cus-dep
failure, so unless there are objections, I'm going use this patch in
the forthcoming debian emacs21 package.

Here's the diff:

diff -ru 0/lisp/gnus/gnus-art.el 1/lisp/gnus/gnus-art.el
--- 0/lisp/gnus/gnus-art.el	2002-03-22 11:03:55.000000000 -0600
+++ 1/lisp/gnus/gnus-art.el	2002-09-15 16:42:46.000000000 -0500
@@ -207,7 +207,10 @@
   (if (and (fboundp 'image-type-available-p)
 	   (image-type-available-p 'xbm))
       'gnus-article-display-xface
-    (if gnus-article-compface-xbm
+    (if (or (and (boundp 'gnus-article-compface-xbm)
+                 gnus-article-compface-xbm)
+            (eq 0 (string-match "#define"
+                                (shell-command-to-string "uncompface -X"))))
 	"{ echo '/* Width=48, Height=48 */'; uncompface; } | display -"
       "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \
 display -"))


-- 
Rob Browning
rlb @defaultvalue.org, @linuxdevel.com, and @debian.org
Previously @cs.utexas.edu
GPG=1C58 8B2C FB5E 3F64 EA5C  64AE 78FE E5FE F0CB A0AD