mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-14 15:40:19 +02:00
Code Activity

remove display-separated.

Browse source 
(build-link): cleanup.
(build-compile): remove space between -I and path.
This commit is contained in:
Han-Wen Nienhuys 2004-10-08 09:46:23 +00:00
parent 07b99edbe8
commit 17b8540143
2 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
guile-config/ChangeLog
View file

@ -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> 2004-09-24 Marius Vollmer <mvo@zagadka.de>
* guile-config.in (build-link, build-compile): Include CFLAGS in * guile-config.in (build-link, build-compile): Include CFLAGS in

27
guile-config/guile-config.in
View file

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