* lisp/dgnushack.el (toplevel): Add paths if and only if APEL and FLIM can't be found.

diff --git a/ChangeLog b/ChangeLog
index 6953b4e..ada0b7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-28  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
+
+       * lisp/dgnushack.el (toplevel): Add paths if and only if APEL and
+       FLIM can't be found.
+
 2001-05-16  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lisp/dgnushack.el (dgnushack-bind-colon-keywords): Don't ignore

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 267c2ea..f599298 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -141,8 +141,10 @@
 ;; optimized because it requires `poe' and then modify the functions.
 (or (featurep 'path-util)
     (load "apel/path-util"))
-(add-path "apel")
-(add-path "flim")
+(or (locate-library "poe")
+    (add-path "apel"))
+(or (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"