diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-12-03 19:15:17 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-12-03 19:15:17 +0100 |
| commit | 99f63f011df2aab38e98d7ee4608a8c70bf74c4d (patch) | |
| tree | 3f224028f30c60f2ed7b9846365ad926192fc7e9 /m4 | |
| parent | e9a8b603337802a77ff2d68f0d30dc0e67721e3a (diff) | |
| parent | 4f03aa23e805bd653de774e1d74ed2f50826899b (diff) | |
| download | guix-99f63f011df2aab38e98d7ee4608a8c70bf74c4d.tar guix-99f63f011df2aab38e98d7ee4608a8c70bf74c4d.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/guix.m4 | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/m4/guix.m4 b/m4/guix.m4 index a6897be961..5c846f7618 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -18,24 +18,6 @@ dnl dnl You should have received a copy of the GNU General Public License dnl along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. -dnl GUIX_ASSERT_LIBGCRYPT_USABLE -dnl -dnl Assert that GNU libgcrypt is usable from Guile. -AC_DEFUN([GUIX_ASSERT_LIBGCRYPT_USABLE], - [AC_CACHE_CHECK([whether $LIBGCRYPT can be dynamically loaded], - [guix_cv_libgcrypt_usable_p], - [GUILE_CHECK([retval], - [(dynamic-func \"gcry_md_hash_buffer\" (dynamic-link \"$LIBGCRYPT\"))]) - if test "$retval" = 0; then - guix_cv_libgcrypt_usable_p="yes" - else - guix_cv_libgcrypt_usable_p="no" - fi]) - - if test "x$guix_cv_libgcrypt_usable_p" != "xyes"; then - AC_MSG_ERROR([GNU libgcrypt does not appear to be usable; see `--with-libgcrypt-prefix' and `README'.]) - fi]) - dnl GUIX_SYSTEM_TYPE dnl dnl Determine the Guix host system type, and store it in the @@ -180,7 +162,7 @@ dnl Check whether a recent-enough Guile-Sqlite3 is available. AC_DEFUN([GUIX_CHECK_GUILE_SQLITE3], [ dnl Check whether 'sqlite-bind-arguments' is available. It was introduced dnl in February 2018: - dnl <https://notabug.org/civodul/guile-sqlite3/commit/1cd1dec96a9999db48c0ff45bab907efc637247f>. + dnl <https://notabug.org/guile-sqlite3/guile-sqlite3/commit/1cd1dec96a9999db48c0ff45bab907efc637247f>. AC_CACHE_CHECK([whether Guile-Sqlite3 is available and recent enough], [guix_cv_have_recent_guile_sqlite3], [GUILE_CHECK([retval], |