X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Femacs-canna.git;a=blobdiff_plain;f=CANNA-CONFIG;h=468eb1b97af303bfb96216bf3a02731297af2aaf;hp=003a880eabd031bb0993d24a130904bb3d47c6a0;hb=HEAD;hpb=2a14f0109fc2e7a05c79672bf2179d515854436e

diff --git a/CANNA-CONFIG b/CANNA-CONFIG
index 003a880..468eb1b 100644
--- a/CANNA-CONFIG
+++ b/CANNA-CONFIG
@@ -1,8 +1,11 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: CANNA-CONFIG,v 1.1 1998-01-16 08:51:11 morioka Exp $
+;;; $Id: CANNA-CONFIG,v 1.3 1999-03-02 19:20:31 morioka Exp $
 ;;;
 
+(load "apel/path-util")
+(add-path "apel")
+
 (defun config-canna ()
   (let ((emacs (car command-line-args))
 	(srcdir (expand-file-name "src" source-directory))
@@ -32,7 +35,7 @@
 				  ))))
     (or canna-libraries
 	(setq canna-libraries
-	      (let ((default-load-path '("/usr/local/lib"))
+	      (let ((default-load-path '("/usr/local/lib" "/usr/lib"))
 		    dir)
 		(require 'path-util)
 		(add-path (expand-file-name "lib" prefix))
@@ -40,7 +43,7 @@
 			    (not (file-exists-p
 				  (expand-file-name "libcanna.a" dir)))
 			    )
-		  (setq default-load-path (cdr dir)))
+		  (setq default-load-path (cdr default-load-path)))
 		dir)))
     (princ (format "\
 emacs=%s
@@ -58,6 +61,9 @@ canna-libraries=%s
   (if (file-exists-p "Makefile")
       (delete-file  "Makefile")
     )
+  (if (string-match "sparc-sun-solaris2" system-configuration)
+      (setq canna-libraries (concat canna-libraries " -R" canna-libraries))
+    )
   (let ((buf (let (vc-follow-symlinks)
 	       (find-file "Makefile.in")
 	       )))