This commit was generated by cvs2svn to compensate for changes in r533,

[elisp/tm.git] / mk-tm

diff --git a/mk-tm b/mk-tm
index 32e7a7c..c3fa123 100644 (file)
--- a/mk-tm
+++ b/mk-tm
@@ -1,6 +1,6 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: mk-tm,v 7.6 1995/12/25 05:33:36 morioka Exp morioka $
+;;; $Id: mk-tm,v 7.7 1996/02/27 21:24:06 morioka Exp $
 ;;;
 
 (setq load-path (append
@@ -20,7 +20,7 @@
 ;; Please specify Mailcrypt path.
 (add-path "mailcrypt-3.4/" 'all-paths)
 
-;; Please specify Mailcrypt path.
+;; Please specify BBDB path.
 (add-path "bbdb-1.50/" 'all-paths)
 
 
@@ -48,29 +48,13 @@
 
 (setq tm-uncompile-el-files '("sc-setup.el"))
 
-(if (catch 'tag
-      (let ((paths load-path) path)
-       (while paths
-         (setq path (expand-file-name "ange-ftp.el" (car paths)))
-         (if (file-exists-p path)
-             (throw 'tag path)
-           )
-         (setq paths (cdr paths))
-         )))
+(if (file-installed-p "ange-ftp.el")
     (setq tm-modules (append tm-modules '("tm-ftp")))
   (setq tm-uncompile-el-files
        (append tm-uncompile-el-files '("tm-ftp.el")))
   )
 
-(if (catch 'tag
-      (let ((paths load-path) path)
-       (while paths
-         (setq path (expand-file-name "vm.elc" (car paths)))
-         (if (file-exists-p path)
-             (throw 'tag path)
-           )
-         (setq paths (cdr paths))
-         )))
+(if (file-installed-p "vm.elc")
     (setq tm-modules (append tm-modules '("tm-vm")))
   (setq tm-uncompile-el-files
        (append tm-uncompile-el-files '("tm-vm.el")))
@@ -113,7 +97,20 @@
 
 (if (string-match "XEmacs" emacs-version)
     (setq tm-modules (append tm-modules '("tm-image")))
-  )
+  (if (boundp 'MULE)
+      (if (catch 'tag
+           (let ((paths load-path) path)
+             (while paths
+               (setq path (expand-file-name "bitmap.el" (car paths)))
+               (if (file-exists-p path)
+                   (throw 'tag path)
+                 )
+               (setq paths (cdr paths))
+               )))
+         (setq tm-modules (append tm-modules '("tm-image")))
+       (setq tm-uncompile-el-files
+             (append tm-uncompile-el-files '("tm-image.el")))
+       )))
 
 (setq tm-el-files
       (mapcar (function (lambda (module)