remove display-separated.

(build-link): cleanup.
(build-compile): remove space between -I and path.

diff --git a/guile-config/ChangeLog b/guile-config/ChangeLog
index 425d5e3..6fe5f64 100644 (file)
--- a/guile-config/ChangeLog
+++ b/guile-config/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-08  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * guile-config.in: remove display-separated.
+       (build-link): cleanup.
+       (build-compile): remove space between -I and path.
+
 2004-09-24  Marius Vollmer  <mvo@zagadka.de>
 
        * guile-config.in (build-link, build-compile): Include CFLAGS in

diff --git a/guile-config/guile-config.in b/guile-config/guile-config.in
index 2faaef6..65fc222 100644 (file)
--- a/guile-config/guile-config.in
+++ b/guile-config/guile-config.in
@@ -148,15 +148,18 @@
     ;; do something more dynamic (i.e. what do we need.
     
     ;; Display the flags, separated by spaces.
-    (display-separated (list (get-build-info 'CFLAGS) ""))
-    (if (or (string=? libdir "/usr/lib")
-            (string=? libdir "/usr/lib/"))
-        (display-separated (cons "-lguile -lguile-ltdl" other-flags))
-        (display-separated (cons
-                            (string-append "-L" (get-build-info 'libdir))
-                            (cons "-lguile -lguile-ltdl" other-flags))))
+    (display (string-join
+             (list
+              (get-build-info 'CFLAGS)
+              (string-join other-flags)
+              "-lguile -lguile-ltdl" 
+              (if (or (string=? libdir "/usr/lib")
+                      (string=? libdir "/usr/lib/"))
+                  (string-append "-L" (get-build-info 'libdir))
+                  ""))))
     (newline)))
 
+
 (define (help-link)
   (let ((dle display-line-error))
     (dle "Usage: " program-name " link")
@@ -182,7 +185,7 @@
   ;; `-I/usr/include' may cause trouble."  For now we hard-code this.
   ;; Later maybe we can do something more dynamic.
   (if (not (string=? (get-build-info 'includedir) "/usr/include"))
-      (display-separated (list "-I" (get-build-info 'includedir) "")))
+      (display (string-append "-I" (get-build-info 'includedir))))
   (display-line (get-build-info 'CFLAGS)))
 
 (define (help-compile)
@@ -249,14 +252,6 @@
            args)
   (newline port))
 
-(define (display-separated args)
-  (if (not (null? args))
-      (begin
-        (display (car args))
-        (for-each
-         (lambda (arg) (display " ") (display arg))
-         (cdr args)))))
-
 \f
 ;;;; the command table