03/03: build: 'GUIX_CHECK_GUILE_JSON' really checks for Guile-JSON 3.x.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 611a64bd7e0893057cd04dcdc2a8d5e7ecc39e45
Author: Ludovic Courtès <address@hidden>
Date:   Sat Aug 17 19:24:08 2019 +0200

    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.
---
 m4/guix.m4 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/m4/guix.m4 b/m4/guix.m4
index 716bfb0..8be7cca 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