remove display-separated.

[bpt/guile.git] / guile-config / guile-config.in

diff --git a/guile-config/guile-config.in b/guile-config/guile-config.in
index c1d60f3..65fc222 100644 (file)
--- a/guile-config/guile-config.in
+++ b/guile-config/guile-config.in
@@ -4,46 +4,21 @@
 ;;;; guile-config --- utility for linking programs with Guile
 ;;;; Jim Blandy <jim@red-bean.com> --- September 1997
 ;;;; 
-;;;;   Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+;;;;   Copyright (C) 1998, 2001, 2004 Free Software Foundation, Inc.
 ;;;; 
-;;;; This program is free software; you can redistribute it and/or modify
-;;;; it under the terms of the GNU General Public License as published by
-;;;; the Free Software Foundation; either version 2, or (at your option)
-;;;; any later version.
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 2.1 of the License, or (at your option) any later version.
 ;;;; 
-;;;; This program is distributed in the hope that it will be useful,
+;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;;; Lesser General Public License for more details.
 ;;;; 
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with this software; see the file COPYING.  If not, write to
-;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;;;; Boston, MA 02111-1307 USA
-;;;; 
-;;;; As a special exception, the Free Software Foundation gives permission
-;;;; for additional uses of the text contained in its release of GUILE.
-;;;; 
-;;;; The exception is that, if you link the GUILE library with other files
-;;;; to produce an executable, this does not by itself cause the
-;;;; resulting executable to be covered by the GNU General Public License.
-;;;; Your use of that executable is in no way restricted on account of
-;;;; linking the GUILE library code into it.
-;;;; 
-;;;; This exception does not however invalidate any other reasons why
-;;;; the executable file might be covered by the GNU General Public License.
-;;;; 
-;;;; This exception applies only to the code released by the
-;;;; Free Software Foundation under the name GUILE.  If you copy
-;;;; code from other Free Software Foundation releases into a copy of
-;;;; GUILE, as the General Public License permits, the exception does
-;;;; not apply to the code that you add in this way.  To avoid misleading
-;;;; anyone as to the status of such modified files, you must delete
-;;;; this exception notice from them.
-;;;; 
-;;;; If you write modifications of your own for GUILE, it is your choice
-;;;; whether to permit this exception to apply to your modifications.
-;;;; If you do not wish that, delete this exception notice.
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 ;;; TODO:
 ;;; * Add some plausible structure for returning the right exit status,
@@ -173,14 +148,18 @@
     ;; do something more dynamic (i.e. what do we need.
     
     ;; Display the flags, separated by spaces.
-    (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")
@@ -206,7 +185,8 @@
   ;; `-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-line "-I" (get-build-info 'includedir))))
+      (display (string-append "-I" (get-build-info 'includedir))))
+  (display-line (get-build-info 'CFLAGS)))
 
 (define (help-compile)
   (let ((dle display-line-error))
@@ -272,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