me
/
guix
Archived
1
0
Fork 0
Code

maint: Check whether Guile-zlib is recent enough. 

This is a followup to a04aef2430.

* m4/guix.m4 (GUIX_CHECK_GUILE_ZLIB): New macro.
* configure.ac: Use it when checking for Guile-zlib.
master
Ludovic Courtès 2021-03-17 10:42:46 +01:00
parent 0571aa7abf
commit 62a091368d
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -151,9 +151,9 @@ if test "x$guix_cv_have_recent_guile_git" != "xyes"; then
fi fi
dnl Check for Guile-zlib. dnl Check for Guile-zlib.
GUILE_MODULE_AVAILABLE([have_guile_zlib], [(zlib)]) GUIX_CHECK_GUILE_ZLIB
if test "x$have_guile_zlib" != "xyes"; then if test "x$guix_cv_have_recent_guile_zlib" != "xyes"; then
AC_MSG_ERROR([Guile-zlib is missing; please install it.]) AC_MSG_ERROR([A recent Guile-zlib could not be found; please install it.])
fi fi
dnl Check for Guile-lzlib. dnl Check for Guile-lzlib.

18
m4/guix.m4
View File

@ -226,6 +226,24 @@ AC_DEFUN([GUIX_CHECK_GUILE_GIT], [
fi]) fi])
]) ])
dnl GUIX_CHECK_GUILE_ZLIB
dnl
dnl Check whether a recent-enough Guile-zlib is available.
AC_DEFUN([GUIX_CHECK_GUILE_ZLIB], [
dnl Check whether we're using Guile-zlib 0.1.0 or later.
dnl 0.1.0 introduced the 'make-zlib-input-port' and related code.
AC_CACHE_CHECK([whether Guile-zlib is available and recent enough],
[guix_cv_have_recent_guile_zlib],
[GUILE_CHECK([retval],
[(use-modules (zlib))
make-zlib-input-port])
if test "$retval" = 0; then
guix_cv_have_recent_guile_zlib="yes"
else
guix_cv_have_recent_guile_zlib="no"
fi])
])
dnl GUIX_TEST_ROOT_DIRECTORY dnl GUIX_TEST_ROOT_DIRECTORY
AC_DEFUN([GUIX_TEST_ROOT_DIRECTORY], [ AC_DEFUN([GUIX_TEST_ROOT_DIRECTORY], [
AC_CACHE_CHECK([for unit test root directory], AC_CACHE_CHECK([for unit test root directory],