X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fdgnushack.el;h=2d8941a120ea92226e45f00555b0c5bc22125949;hb=cef4242f0e340a08baa5493ff48f4eeb118cea74;hp=3569cf4729fcaaca193d2cf7a4df346315563573;hpb=9eb9d4904cd4cf0d9317355ebcb430390833babc;p=gnus

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 3569cf472..2d8941a12 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -1,7 +1,8 @@
 ;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994,95,96,97 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+;;        Free Software Foundation, Inc.
 
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Version: 4.19
 ;; Keywords: news, path
 
@@ -26,12 +27,67 @@
 
 ;;; Code:
 
-(fset 'facep 'ignore)
+(defalias 'facep 'ignore)
 
 (require 'cl)
+
+(defvar srcdir (or (getenv "srcdir") "."))
+
+(push (or (getenv "lispdir")
+	  "/usr/share/emacs/site-lisp")
+      load-path)
+
+(push (or (getenv "W3DIR") (expand-file-name "../../w3/lisp/" srcdir))
+      load-path)
+
+(push "/usr/share/emacs/site-lisp" load-path)
+
+(unless (featurep 'xemacs)
+  (define-compiler-macro last (&whole form x &optional n)
+    (if (and (fboundp 'last)
+	     (subrp (symbol-function 'last)))
+	form
+      (if n
+	  `(let* ((x ,x)
+		  (n ,n)
+		  (m 0)
+		  (p x))
+	     (while (consp p)
+	       (incf m)
+	       (pop p))
+	     (if (<= n 0)
+		 p
+	       (if (< n m)
+		   (nthcdr (- m n) x)
+		 x)))
+	`(let ((x ,x))
+	   (while (consp (cdr x))
+	     (pop x))
+	   x))))
+  )
+
+;; If we are building w3 in a different directory than the source
+;; directory, we must read *.el from source directory and write *.elc
+;; into the building directory.  For that, we define this function
+;; before loading bytecomp.  Bytecomp doesn't overwrite this function.
+(defun byte-compile-dest-file (filename)
+  "Convert an Emacs Lisp source file name to a compiled file name.
+ In addition, remove directory name part from FILENAME."
+  (setq filename (byte-compiler-base-file-name filename))
+  (setq filename (file-name-sans-versions filename))
+  (setq filename (file-name-nondirectory filename))
+  (if (memq system-type '(win32 w32 mswindows windows-nt))
+      (setq filename (downcase filename)))
+  (cond ((eq system-type 'vax-vms)
+	 (concat (substring filename 0 (string-match ";" filename)) "c"))
+	((string-match emacs-lisp-file-regexp filename)
+	 (concat (substring filename 0 (match-beginning 0)) ".elc"))
+	(t (concat filename ".elc"))))
+
 (require 'bytecomp)
-(push "." load-path)
-(require 'lpath)
+
+(push srcdir load-path)
+(load (expand-file-name "lpath.el" srcdir) nil t)
 
 (defalias 'device-sound-enabled-p 'ignore)
 (defalias 'play-sound-file 'ignore)
@@ -41,37 +97,68 @@
 (defalias 'define-mail-user-agent 'ignore)
 
 (eval-and-compile
-  (unless (string-match "XEmacs" emacs-version)
-    (fset 'get-popup-menu-response 'ignore)
-    (fset 'event-object 'ignore)
-    (fset 'x-defined-colors 'ignore)
-    (fset 'read-color 'ignore)))
+  (unless (featurep 'xemacs)
+    (defalias 'get-popup-menu-response 'ignore)
+    (defalias 'event-object 'ignore)
+    (defalias 'x-defined-colors 'ignore)
+    (defalias 'read-color 'ignore)))
 
-(setq byte-compile-warnings
-      '(free-vars unresolved callargs redefine obsolete))
-
-(defun dgnushack-compile ()
+(defun dgnushack-compile (&optional warn)
   ;;(setq byte-compile-dynamic t)
-  (let ((files (directory-files "." nil "^[^=].*\\.el$"))
-	(xemacs (string-match "XEmacs" emacs-version))
+  (unless warn
+    (setq byte-compile-warnings
+	  '(free-vars unresolved callargs redefine)))
+  (unless (locate-library "cus-edit")
+    (error "You do not seem to have Custom installed.
+Fetch it from <URL:http://www.dina.kvl.dk/~abraham/custom/>.
+You also then need to add the following to the lisp/dgnushack.el file:
+
+     (push \"~/lisp/custom\" load-path)
+
+Modify to suit your needs."))
+  (let ((files (directory-files srcdir nil "^[^=].*\\.el$"))
 	;;(byte-compile-generate-call-tree t)
-	byte-compile-warnings file elc)
-    (condition-case ()
+	file elc)
+    ;; Avoid barfing (from gnus-xmas) because the etc directory is not yet
+    ;; installed.
+    (when (featurep 'xemacs)
+      (setq gnus-xmas-glyph-directory "dummy"))
+    (dolist (file '("dgnushack.el" "lpath.el"))
+      (setq files (delete file files)))
+    (when (featurep 'base64)
+      (setq files (delete "base64.el" files)))
+    (condition-case code
 	(require 'w3-forms)
-      (error (setq files (delete "nnweb.el" files))))
+      (error
+       (message "No w3: %s %s" code (locate-library "w3-forms"))
+       (dolist (file '("nnweb.el" "nnlistserv.el" "nnultimate.el"
+		       "nnslashdot.el" "nnwarchive.el" "webmail.el"
+		       "nnwfm.el"))
+	 (setq files (delete file files)))))
+    (dolist (file
+	     (if (featurep 'xemacs)
+		 '("md5.el" "smiley-ems.el")
+	       '("gnus-xmas.el" "gnus-picon.el" "messagexmas.el"
+		 "nnheaderxm.el" "smiley.el")))
+      (setq files (delete file files)))
+
+    (dolist (file files)
+      (setq file (expand-file-name file srcdir))
+      (when (and (file-exists-p
+		  (setq elc (concat (file-name-nondirectory file) "c")))
+		 (file-newer-than-file-p file elc))
+	(delete-file elc)))
+
     (while (setq file (pop files))
-      (when (or (not (member file '("gnus-xmas.el" "gnus-picon.el"
-				    "messagexmas.el" "nnheaderxm.el"
-				    "smiley.el")))
-		xemacs)
-	(when (or (not (file-exists-p (setq elc (concat file "c"))))
-		  (file-newer-than-file-p file elc))
-	  (ignore-errors
-	    (byte-compile-file file)))))))
+      (setq file (expand-file-name file srcdir))
+      (when (or (not (file-exists-p
+		      (setq elc (concat (file-name-nondirectory file) "c"))))
+		(file-newer-than-file-p file elc))
+	(ignore-errors
+	  (byte-compile-file file))))))
 
 (defun dgnushack-recompile ()
   (require 'gnus)
   (byte-recompile-directory "." 0))
 
 ;;; dgnushack.el ends here
-