* strings.h: don't use SCM_P. don't include <string.h>.

[bpt/guile.git] / ice-9 / boot-9.scm

diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index 10d5862..0efd8ec 100644 (file)
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -43,6 +43,9 @@
 ;;; presumably deprecated.
 (define feature? provided?)
 
+;;; let format alias simple-format until the more complete version is loaded
+(define format simple-format)
+
 \f
 ;;; {R4RS compliance}
 
@@ -591,10 +594,10 @@
   (save-stack)
   (if (null? args)
       (scm-error 'misc-error #f "?" #f #f)
-      (let loop ((msg "%s")
+      (let loop ((msg "~A")
                 (rest (cdr args)))
        (if (not (null? rest))
-           (loop (string-append msg " %S")
+           (loop (string-append msg " ~S")
                  (cdr rest))
            (scm-error 'misc-error #f msg args #f)))))
 
@@ -1971,14 +1974,14 @@
 
 (define (find-and-link-dynamic-module module-name)
   (define (make-init-name mod-name)
-    (string-append 'scm_init
+    (string-append "scm_init"
                   (list->string (map (lambda (c)
                                        (if (or (char-alphabetic? c)
                                                (char-numeric? c))
                                            c
                                            #\_))
                                      (string->list mod-name)))
-                  '_module))
+                  "_module"))
 
   ;; Put the subdirectory for this module in the car of SUBDIR-AND-LIBNAME,
   ;; and the `libname' (the name of the module prepended by `lib') in the cdr
@@ -2017,17 +2020,7 @@
   (let ((libtool-filename (in-vicinity libdir
                                       (string-append libname ".la"))))
     (and (file-exists? libtool-filename)
-        (with-input-from-file libtool-filename
-          (lambda ()
-            (let loop ((ln (read-line)))
-              (cond ((eof-object? ln) #f)
-                    ((and (> (string-length ln) 9)
-                          (string=? "dlname='" (substring ln 0 8))
-                          (string-index ln #\' 8))
-                     =>
-                     (lambda (end)
-                       (in-vicinity libdir (substring ln 8 end))))
-                    (else (loop (read-line))))))))))
+        libtool-filename)))
                              
 (define (try-using-sharlib-name libdir libname)
   (in-vicinity libdir (string-append libname ".so")))
@@ -2851,7 +2844,7 @@
                  (sigaction (car sig-msg)
                             (car old-handler)
                             (cdr old-handler))))
-                        signals old-handlers)))))
+           signals old-handlers)))))
 
 (defmacro false-if-exception (expr)
   `(catch #t (lambda () ,expr)