summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2012-01-29 16:30:12 +0000
committerPaul Smith <psmith@gnu.org>2012-01-29 16:30:12 +0000
commitd6e1c6e6c5961b8e7dee7ff1fc7d1792ab0fb4f8 (patch)
tree0267dbb1a49fe4443167fca729d1945853f74d94
parentaa07c063876a48afc9b0fe4d266cc4f3e9fe0051 (diff)
downloadmake-d6e1c6e6c5961b8e7dee7ff1fc7d1792ab0fb4f8.tar.gz
Guile portability
Don't support Guile 1.6 and use a portable test for printable strings.
-rw-r--r--ChangeLog6
-rw-r--r--gmk-default.scm3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e39644..3c52a4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-29 Paul Smith <psmith@gnu.org>
+
+ * gmk-default.scm (to-string-maybe): Use a more portable way to
+ test for unprintable characters.
+ * configure.in [GUILE]: Guile 1.6 doesn't have pkg-config
+
2012-01-28 Eli Zaretskii <eliz@gnu.org>
* config.h.W32.template: Update from config.h.in.
diff --git a/gmk-default.scm b/gmk-default.scm
index b9161c4..9aca54a 100644
--- a/gmk-default.scm
+++ b/gmk-default.scm
@@ -31,8 +31,7 @@
((char? x)
(string x))
;; Printable string (no special characters)
- ((and (string? x)
- (eq? (string-length (string-delete x char-set:printing)) 0))
+ ((and (string? x) (string-every char-set:printing x))
x)
;; No idea: fail
(else (error "Unknown object:" x))))