diff options
| author | Leo Famulari <leo@famulari.name> | 2018-01-11 14:22:50 -0800 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2018-01-11 14:22:50 -0800 |
| commit | 4adb40bffc0dda8871878283887a0e0cd88d9578 (patch) | |
| tree | 74d5fb686116002da72de4a1075d0ed8f307cec1 /m4/guix.m4 | |
| parent | 4610ab7c9a5327df0d475262817bc081a5891aa8 (diff) | |
| parent | 138c08899ba73049de8afd2b74a8cf6845a1d9e1 (diff) | |
| download | patches-4adb40bffc0dda8871878283887a0e0cd88d9578.tar patches-4adb40bffc0dda8871878283887a0e0cd88d9578.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'm4/guix.m4')
| -rw-r--r-- | m4/guix.m4 | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/m4/guix.m4 b/m4/guix.m4 index add57f5262..721285b014 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -1,5 +1,5 @@ dnl GNU Guix --- Functional package management for GNU -dnl Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> +dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org> dnl Copyright © 2014 Mark H Weaver <mhw@netris.org> dnl Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> dnl @@ -153,6 +153,26 @@ AC_DEFUN([GUIX_CHECK_UNBUFFERED_CBIP], [ fi]) ]) +dnl GUIX_ASSERT_SYNTAX_OBJECT_EQUAL +dnl +dnl Guile 2.2.1 was a brown-paper-bag release where 'equal?' wouldn't work +dnl for syntax objects, which broke gexps. Unfortunately Fedora 25 provides it. +dnl Reject it. +AC_DEFUN([GUIX_ASSERT_SYNTAX_OBJECT_EQUAL], [ + AC_CACHE_CHECK([whether 'equal?' works for syntax objects], + [ac_cv_guix_syntax_object_equal], + [if "$GUILE" -c '(exit (equal? (syntax x) (syntax x)))' + then + ac_cv_guix_syntax_object_equal=yes + else + ac_cv_guix_syntax_object_equal=no + fi]) + if test "x$ac_cv_guix_syntax_object_equal" != xyes; then + # This bug was present in Guile 2.2.1 only. + AC_MSG_ERROR(['equal?' does not work for syntax object; upgrade to Guile 2.2.2 or later.]) + fi +]) + dnl GUIX_CHECK_GUILE_SSH dnl dnl Check whether a recent-enough Guile-SSH is available. |