kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

maint: Check whether Guile-Gcrypt is recent enough.

Browse Source 
Suggested by Danny Milosavljevic <dannym@scratchpost.org>
in <https://bugs.gnu.org/41494>.

* m4/guix.m4 (GUIX_CHECK_GUILE_GCRYPT): New macro.
* configure.ac: Use it.
This commit is contained in:
Ludovic Courtès 2020-05-27 14:28:00 +02:00
parent c041c360b7
commit c1dc50ab20
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -136,9 +136,9 @@ if test "x$guix_cv_have_recent_guile_sqlite3" != "xyes"; then
AC_MSG_ERROR([A recent Guile-SQLite3 could not be found; please install it.]) AC_MSG_ERROR([A recent Guile-SQLite3 could not be found; please install it.])
fi fi
GUILE_MODULE_AVAILABLE([have_guile_gcrypt], [(gcrypt hash)]) GUIX_CHECK_GUILE_GCRYPT
if test "x$have_guile_gcrypt" != "xyes"; then if test "x$guix_cv_have_recent_guile_gcrypt" != "xyes"; then
AC_MSG_ERROR([Guile-Gcrypt could not be found; please install it.]) AC_MSG_ERROR([A recent Guile-Gcrypt could not be found; please install it.])
fi fi
dnl Guile-newt is used by the graphical installer. dnl Guile-newt is used by the graphical installer.

20
m4/guix.m4
View File

@ -1,5 +1,5 @@
dnl GNU Guix --- Functional package management for GNU dnl GNU Guix --- Functional package management for GNU
dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org> dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
dnl Copyright © 2014 Mark H Weaver <mhw@netris.org> dnl Copyright © 2014 Mark H Weaver <mhw@netris.org>
dnl Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> dnl Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
dnl dnl
@ -194,6 +194,24 @@ AC_DEFUN([GUIX_CHECK_GUILE_JSON], [
fi]) fi])
]) ])
dnl GUIX_CHECK_GUILE_GCRYPT
dnl
dnl Check whether a recent-enough Guile-Gcrypt is available.
AC_DEFUN([GUIX_CHECK_GUILE_GCRYPT], [
dnl Check whether we're using Guile-Gcrypt 0.2.x or later. 0.2.0
dnl introduced the 'hash-algorithm' macro and related code.
AC_CACHE_CHECK([whether Guile-Gcrypt is available and recent enough],
[guix_cv_have_recent_guile_gcrypt],
[GUILE_CHECK([retval],
[(use-modules (gcrypt hash))
(equal? (hash-algorithm sha256)
(lookup-hash-algorithm 'sha256))])
if test "$retval" = 0; then
guix_cv_have_recent_guile_gcrypt="yes"
else
guix_cv_have_recent_guile_gcrypt="no"
fi])
])
dnl GUIX_TEST_ROOT_DIRECTORY dnl GUIX_TEST_ROOT_DIRECTORY
AC_DEFUN([GUIX_TEST_ROOT_DIRECTORY], [ AC_DEFUN([GUIX_TEST_ROOT_DIRECTORY], [