(defvar srcdir (or (getenv "srcdir") "."))
-(let ((urldir (getenv "URLDIR")))
- (unless (zerop (length urldir))
- (push (file-name-as-directory urldir) load-path)))
-
(defvar dgnushack-w3-directory (let ((w3dir (getenv "W3DIR")))
(unless (zerop (length w3dir))
(file-name-as-directory w3dir))))
-(when dgnushack-w3-directory
- (push dgnushack-w3-directory load-path))
+
+(let ((urldir (getenv "URLDIR")))
+ (unless (zerop (length urldir))
+ (setq urldir (file-name-as-directory urldir))
+ (push (file-name-as-directory urldir) load-path))
+ (when (and dgnushack-w3-directory
+ (not (string-equal urldir dgnushack-w3-directory)))
+ (push dgnushack-w3-directory load-path)))
;; If we are building w3 in a different directory than the source
;; directory, we must read *.el from source directory and write *.elc
(require 'bytecomp)
+(when (boundp 'MULE)
+ (let (current-load-list)
+ ;; Make the function to be silent at compile-time.
+ (defun locate-library (library &optional nosuffix)
+ "Show the full path name of Emacs library LIBRARY.
+This command searches the directories in `load-path' like `M-x load-library'
+to find the file that `M-x load-library RET LIBRARY RET' would load.
+Optional second arg NOSUFFIX non-nil means don't add suffixes `.elc' or `.el'
+to the specified name LIBRARY (a la calling `load' instead of `load-library')."
+ (interactive "sLocate library: ")
+ (catch 'answer
+ (mapcar
+ '(lambda (dir)
+ (mapcar
+ '(lambda (suf)
+ (let ((try (expand-file-name (concat library suf) dir)))
+ (and (file-readable-p try)
+ (null (file-directory-p try))
+ (progn
+ (or noninteractive
+ (message "Library is file %s" try))
+ (throw 'answer try)))))
+ (if nosuffix '("") '(".elc" ".el" ""))))
+ load-path)
+ (or noninteractive
+ (message "No library %s in search path" library))
+ nil))
+ (byte-compile 'locate-library)))
+
(unless (fboundp 'si:byte-optimize-form-code-walker)
(byte-optimize-form nil);; Load `byte-opt' or `byte-optimize'.
(setq max-specpdl-size 3000)
;; Don't load path-util until `char-after' and `char-before' have been
;; optimized because it requires `poe' and then modify the functions.
-(or (featurep 'path-util)
- (load "apel/path-util"))
-(add-path "apel")
-(add-path "flim")
+
+;; If the APEL modules are installed under the non-standard directory,
+;; for example "/var/home/john/lisp/apel-VERSION/", you should add that
+;; name using the configure option "--with-addpath=".
+;; And also the directory where the EMU modules are installed, for
+;; example "/usr/local/share/mule/19.34/site-lisp/", it should be
+;; included in the standard `load-path' or added by the configure
+;; option "--with-addpath=".
+(let ((path (or (locate-library "path-util")
+ (locate-library "apel/path-util")));; backward compat.
+ parent lpath)
+ (if path
+ (progn
+ (when (string-match "/$" (setq path (file-name-directory path)))
+ (setq path (substring path 0 (match-beginning 0))))
+ ;; path == "/var/home/john/lisp/apel-VERSION"
+ (when (string-match "/$" (setq parent (file-name-directory path)))
+ (setq parent (substring path 0 (match-beginning 0))))
+ ;; parent == "/var/home/john/lisp"
+ (if (setq lpath (or (member path load-path)
+ (member (file-name-as-directory path) load-path)))
+ (unless (or (member parent load-path)
+ (member (file-name-as-directory parent) load-path))
+ (push parent (cdr lpath)))
+ (push path load-path)
+ (unless (or (member parent load-path)
+ (member (file-name-as-directory parent) load-path))
+ (push parent (cdr load-path))))
+ (require 'path-util))
+ (error "
+APEL modules are not found in %s.
+Try to re-configure with --with-addpath=APEL_PATH and run make again.
+"
+ load-path)))
+
+(unless (locate-library "mel")
+ (add-path "flim"))
(unless (module-installed-p 'mel)
;; FLIM 1.14 may have installed in two "flim" subdirectories.
(push (expand-file-name "flim"
load-path)
(unless (module-installed-p 'mel)
(error "
-FLIM package does not found in %s.
+FLIM modules does not found in %s.
Try to re-configure with --with-addpath=FLIM_PATH and run make again.
"
- (progn
- (add-path "semi")
- load-path))))
+ load-path)))
(add-path "semi")
(push srcdir load-path)
byte-compile-function-environment)))
form)
-(when (boundp 'MULE)
- (let (current-load-list)
- ;; Make the function to be silent at compile-time.
- (defun locate-library (library &optional nosuffix)
- "Show the full path name of Emacs library LIBRARY.
-This command searches the directories in `load-path' like `M-x load-library'
-to find the file that `M-x load-library RET LIBRARY RET' would load.
-Optional second arg NOSUFFIX non-nil means don't add suffixes `.elc' or `.el'
-to the specified name LIBRARY (a la calling `load' instead of `load-library')."
- (interactive "sLocate library: ")
- (catch 'answer
- (mapcar
- '(lambda (dir)
- (mapcar
- '(lambda (suf)
- (let ((try (expand-file-name (concat library suf) dir)))
- (and (file-readable-p try)
- (null (file-directory-p try))
- (progn
- (or noninteractive
- (message "Library is file %s" try))
- (throw 'answer try)))))
- (if nosuffix '("") '(".elc" ".el" ""))))
- load-path)
- (or noninteractive
- (message "No library %s in search path" library))
- nil))
- (byte-compile 'locate-library)))
-
(condition-case nil
:symbol-for-testing-whether-colon-keyword-is-available-or-not
(void-variable
(defconst dgnushack-unexporting-files
(append '("dgnushack.el" "dgnuspath.el" "dgnuskwds.el" "lpath.el")
+ (condition-case nil
+ (progn (require 'shimbun) nil)
+ (error '("nnshimbun.el")))
(unless (or (condition-case code
(require 'w3-forms)
(error
projects / elisp / gnus.git- / blobdiff