Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fca3c61..0618166 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * dgnushack.el (dgnushack-compile): Detect mh-e and xml.
+
 2001-10-09  Per Abrahamsen  <abraham@dina.kvl.dk>
 
        * message.el (message-send-news): Oops, missed case with no

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 2c00894..f7d7796 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -461,9 +461,21 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again.
            '("nnweb.el" "nnlistserv.el" "nnultimate.el"
              "nnslashdot.el" "nnwarchive.el" "webmail.el"
              "nnwfm.el" "nnrss.el"))
-         (condition-case nil
+         (condition-case code
+             (progn (require 'mh-e) nil)
+           (error
+            (message "No mh-e: %s %s (ignored)" code (locate-library "mh-e"))
+            '("gnus-mh.el")))
+         (condition-case code
+             (progn (require 'xml) nil)
+           (error
+            (message "No xml: %s %s (ignored)" code (locate-library "xml"))
+            '("nnrss.el")))
+         (condition-case code
              (progn (require 'bbdb) nil)
-           (error '("gnus-bbdb.el")))
+           (error
+            (message "No bbdb: %s %s (ignored)" code (locate-library "bbdb"))
+            '("gnus-bbdb.el")))
          (unless (featurep 'xemacs)
            '("gnus-xmas.el" "gnus-picon.el" "messagexmas.el"
              "nnheaderxm.el" "smiley.el"))