guile/guile-core/guile-config ChangeLog guile-c...

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Mikael Djurfeldt <address@hidden>       01/03/07 18:43:20

Modified files:
        guile-core/guile-config: ChangeLog guile-config.in 

Log message:
        * guile-config.in (build-link): Really reverted the change of
        2001-03-05.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/guile-config/ChangeLog.diff?r1=1.21&r2=1.22
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/guile-config/guile-config.in.diff?r1=1.12&r2=1.13

Patches:
Index: guile/guile-core/guile-config/ChangeLog
diff -u guile/guile-core/guile-config/ChangeLog:1.21 
guile/guile-core/guile-config/ChangeLog:1.22
--- guile/guile-core/guile-config/ChangeLog:1.21        Tue Mar  6 05:27:33 2001
+++ guile/guile-core/guile-config/ChangeLog     Wed Mar  7 18:43:20 2001
@@ -1,3 +1,8 @@
+2001-03-07  Mikael Djurfeldt  <address@hidden>
+
+       * guile-config.in (build-link): Really reverted the change of
+       2001-03-05.
+
 2001-03-06  Dirk Herrmann  <address@hidden>
 
        * guile-config.in (build-link): Reverted the previous patch.
Index: guile/guile-core/guile-config/guile-config.in
diff -u guile/guile-core/guile-config/guile-config.in:1.12 
guile/guile-core/guile-config/guile-config.in:1.13
--- guile/guile-core/guile-config/guile-config.in:1.12  Mon Mar  5 06:26:55 2001
+++ guile/guile-core/guile-config/guile-config.in       Wed Mar  7 18:43:20 2001
@@ -140,36 +140,36 @@
        (string-append program-name
                      " link: arguments to subcommand not yet implemented")))
 
-  (let ((flags
-        (let loop ((libs
-                    ;; Get the string of linker flags we used to build
-                    ;; Guile, and break it up into a list.
-                    (separate-fields-discarding-char #\space
-                                                     (get-build-info 'LIBS)
-                                                     list)))
+  (let* ((flags
+         (let loop ((libs
+                     ;; Get the string of linker flags we used to build
+                     ;; Guile, and break it up into a list.
+                     (separate-fields-discarding-char #\space
+                                                      (get-build-info 'LIBS)
+                                                      list)))
 
-          (cond
-           ((null? libs) '())
+           (cond
+            ((null? libs) '())
 
-           ;; Turn any "FOO/libBAR.a" elements into "-lBAR".
-           ((match-lib (car libs))
-            => (lambda (bar)
-                 (cons (string-append "-l" bar)
-                       (loop (cdr libs)))))
-           
-           ;; Remove any empty strings that may have seeped in there.
-           ((string=? (car libs) "") (loop (cdr libs)))
+            ;; Turn any "FOO/libBAR.a" elements into "-lBAR".
+            ((match-lib (car libs))
+             => (lambda (bar)
+                  (cons (string-append "-l" bar)
+                        (loop (cdr libs)))))
+
+            ;; Remove any empty strings that may have seeped in there.
+            ((string=? (car libs) "") (loop (cdr libs)))
            
-            (else (cons (car libs) (loop (cdr libs))))))))
+            (else (cons (car libs) (loop (cdr libs)))))))
 
-    ;; Include libguile itself in the list, along with the
-    ;; directory it was installed in.
-    (let (flags (cons (string-append "-L" (get-build-info 'libdir))
-                     (cons "-lguile" flags)))
+        ;; Include libguile itself in the list, along with the
+        ;; directory it was installed in.
+        (flags (cons (string-append "-L" (get-build-info 'libdir))
+                     (cons "-lguile" flags))))
 
-      ;; Display the flags, separated by spaces.
-      (display-separated flags)
-      (newline))))
+    ;; Display the flags, separated by spaces.
+    (display-separated flags)
+    (newline)))
 
 (define (help-link)
   (let ((dle display-line-error))