diff options
| author | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-23 14:53:44 +0200 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-23 14:53:44 +0200 |
| commit | 1828958db52d0019a7f3d763b07e64f78afa2cbf (patch) | |
| tree | 8bdff27c5b3dc088d923e91a14a38f6a6b9fa661 /m4 | |
| parent | 7e463dd16b7e273011f0beafa57a89fa2d525f8b (diff) | |
| parent | 23744435613aa040beacc61a0825cc72280da80a (diff) | |
| download | guix-1828958db52d0019a7f3d763b07e64f78afa2cbf.tar.gz | |
Merge branch 'wip-lisp' into staging
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/guix.m4 | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/m4/guix.m4 b/m4/guix.m4 index 7256e792a5..2fcc65e039 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -161,14 +161,23 @@ dnl GUIX_CHECK_GUILE_JSON dnl dnl Check whether a recent-enough Guile-JSON is available. AC_DEFUN([GUIX_CHECK_GUILE_JSON], [ - dnl Check whether we're using Guile-JSON 3.x, which uses a JSON-to-Scheme - dnl mapping different from that of earlier versions. + dnl Check whether we're using Guile-JSON 4.3+, which provides + dnl 'define-json-mapping'. AC_CACHE_CHECK([whether Guile-JSON is available and recent enough], [guix_cv_have_recent_guile_json], [GUILE_CHECK([retval], - [(use-modules (json) (ice-9 match)) - (match (json-string->scm \"[[ { \\\"a\\\": 42 } ]]\") - (#((("a" . 42))) #t))]) + [(use-modules (json)) + + (define-json-mapping <frob> make-frob + frob? + json->frob + (a frob-a) + (b frob-b \"bee\")) + + (exit + (equal? (json->frob + (open-input-string \"{ \\\"a\\\": 1, \\\"bee\\\": 2 }\")) + (make-frob 1 2)))]) if test "$retval" = 0; then guix_cv_have_recent_guile_json="yes" else |