diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-08-17 19:24:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-08-17 19:26:21 +0200 |
| commit | 611a64bd7e0893057cd04dcdc2a8d5e7ecc39e45 (patch) | |
| tree | daa43a885db5aa8289e27dd6cf55f1f275f9c5c1 | |
| parent | 23ab21fa9d4ed47035dc446b10e9110243d9cdf0 (diff) | |
| download | guix-611a64bd7e0893057cd04dcdc2a8d5e7ecc39e45.tar guix-611a64bd7e0893057cd04dcdc2a8d5e7ecc39e45.tar.gz | |
build: 'GUIX_CHECK_GUILE_JSON' really checks for Guile-JSON 3.x.
Until now the 'guile' process would always exit with 0, as long
as Guile-JSON is installed, whether it's version 1 or version 3.
* m4/guix.m4 (GUIX_CHECK_GUILE_JSON): Fix array syntax and remove
catch-all 'match' clause.
| -rw-r--r-- | m4/guix.m4 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/m4/guix.m4 b/m4/guix.m4 index 716bfb08ec..8be7cca54f 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -184,9 +184,8 @@ AC_DEFUN([GUIX_CHECK_GUILE_JSON], [ [guix_cv_have_recent_guile_json], [GUILE_CHECK([retval], [(use-modules (json) (ice-9 match)) - (match (json-string->scm \"[[] { \\\"a\\\": 42 } []]\") - (#(("a" . 42)) #t) - (_ #f))]) + (match (json-string->scm \"[[ { \\\"a\\\": 42 } ]]\") + (#((("a" . 42))) #t))]) if test "$retval" = 0; then guix_cv_have_recent_guile_json="yes" else |