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 /config-daemon.ac | |
parent | 4610ab7c9a5327df0d475262817bc081a5891aa8 (diff) | |
parent | 138c08899ba73049de8afd2b74a8cf6845a1d9e1 (diff) | |
download | guix-patches-4adb40bffc0dda8871878283887a0e0cd88d9578.tar guix-patches-4adb40bffc0dda8871878283887a0e0cd88d9578.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'config-daemon.ac')
-rw-r--r-- | config-daemon.ac | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/config-daemon.ac b/config-daemon.ac index 42b59819d3..80d84cbdbc 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -18,11 +18,18 @@ if test "x$guix_build_daemon" = "xyes"; then dnl Use 64-bit file system calls so that we can support files > 2 GiB. AC_SYS_LARGEFILE - dnl Look for libbz2, a required dependency. - AC_CHECK_LIB([bz2], [BZ2_bzWriteOpen], [true], - [AC_MSG_ERROR([Guix requires libbz2, which is part of bzip2. See http://www.bzip.org/.])]) - AC_CHECK_HEADERS([bzlib.h], [true], - [AC_MSG_ERROR([Guix requires libbz2, which is part of bzip2. See http://www.bzip.org/.])]) + dnl Look for zlib, a required dependency. + AC_CHECK_LIB([z], [gzdopen], [true], + [AC_MSG_ERROR([Guix requires zlib. See http://www.zlib.net/.])]) + AC_CHECK_HEADERS([zlib.h], [true], + [AC_MSG_ERROR([Guix requires zlib. See http://www.zlib.net/.])]) + + dnl Look for libbz2, an optional dependency. + AC_CHECK_LIB([bz2], [BZ2_bzWriteOpen], [HAVE_LIBBZ2=yes], [HAVE_LIBBZ2=no]) + if test "x$HAVE_LIBBZ2" = xyes; then + AC_CHECK_HEADERS([bzlib.h]) + HAVE_LIBBZ2="$ac_cv_header_bzlib_h" + fi dnl Look for SQLite, a required dependency. PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.6.19]) @@ -163,6 +170,7 @@ if test "x$guix_build_daemon" = "xyes"; then [chmod +x nix/scripts/offload]) fi +AM_CONDITIONAL([HAVE_LIBBZ2], [test "x$HAVE_LIBBZ2" = "xyes"]) AM_CONDITIONAL([BUILD_DAEMON], [test "x$guix_build_daemon" = "xyes"]) AM_CONDITIONAL([BUILD_DAEMON_OFFLOAD], \ [test "x$guix_build_daemon" = "xyes" \ |