nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2019-08-17 19:24:08 +02:00
parent 23ab21fa9d
commit 611a64bd7e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
m4/guix.m4
View File

@ -184,9 +184,8 @@ AC_DEFUN([GUIX_CHECK_GUILE_JSON], [
[guix_cv_have_recent_guile_json], [guix_cv_have_recent_guile_json],
[GUILE_CHECK([retval], [GUILE_CHECK([retval],
[(use-modules (json) (ice-9 match)) [(use-modules (json) (ice-9 match))
(match (json-string->scm \"[[] { \\\"a\\\": 42 } []]\") (match (json-string->scm \"[[ { \\\"a\\\": 42 } ]]\")
(#(("a" . 42)) #t) (#((("a" . 42))) #t))])
(_ #f))])
if test "$retval" = 0; then if test "$retval" = 0; then
guix_cv_have_recent_guile_json="yes" guix_cv_have_recent_guile_json="yes"
else else