mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
build: Always check for gzip/bzip2/xz.
This allows (guix config) to contain valid values of %GZIP et al. even when configured with --disable-daemon. * config-daemon.ac: Move 'AC_PATH_PROG' invocations for gzip & co. to... * configure.ac: ... here.
This commit is contained in:
parent
6b6a0b143d
commit
cd48eae560
2 changed files with 8 additions and 8 deletions
|
@ -14,14 +14,6 @@ if test "x$guix_build_daemon" = "xyes"; then
|
||||||
AC_PROG_RANLIB
|
AC_PROG_RANLIB
|
||||||
AC_CONFIG_HEADER([nix/config.h])
|
AC_CONFIG_HEADER([nix/config.h])
|
||||||
|
|
||||||
dnl Decompressors, for use by the substituter.
|
|
||||||
AC_PATH_PROG([GZIP], [gzip])
|
|
||||||
AC_PATH_PROG([BZIP2], [bzip2])
|
|
||||||
AC_PATH_PROG([XZ], [xz])
|
|
||||||
AC_SUBST([GZIP])
|
|
||||||
AC_SUBST([BZIP2])
|
|
||||||
AC_SUBST([XZ])
|
|
||||||
|
|
||||||
dnl Use 64-bit file system calls so that we can support files > 2 GiB.
|
dnl Use 64-bit file system calls so that we can support files > 2 GiB.
|
||||||
AC_SYS_LARGEFILE
|
AC_SYS_LARGEFILE
|
||||||
|
|
||||||
|
|
|
@ -90,6 +90,14 @@ GUIX_CHECK_LIBC_MOUNT
|
||||||
AM_CONDITIONAL([BUILD_SYSCALLS_MODULE],
|
AM_CONDITIONAL([BUILD_SYSCALLS_MODULE],
|
||||||
[test "x$guix_cv_libc_has_mount" = "xyes"])
|
[test "x$guix_cv_libc_has_mount" = "xyes"])
|
||||||
|
|
||||||
|
dnl Decompressors, for use by the substituter and other modules.
|
||||||
|
AC_PATH_PROG([GZIP], [gzip])
|
||||||
|
AC_PATH_PROG([BZIP2], [bzip2])
|
||||||
|
AC_PATH_PROG([XZ], [xz])
|
||||||
|
AC_SUBST([GZIP])
|
||||||
|
AC_SUBST([BZIP2])
|
||||||
|
AC_SUBST([XZ])
|
||||||
|
|
||||||
AC_ARG_WITH([nix-prefix],
|
AC_ARG_WITH([nix-prefix],
|
||||||
[AS_HELP_STRING([--with-nix-prefix=DIR],
|
[AS_HELP_STRING([--with-nix-prefix=DIR],
|
||||||
[search for Nix in DIR (for testing purposes and '--disable-daemon' builds)])],
|
[search for Nix in DIR (for testing purposes and '--disable-daemon' builds)])],
|
||||||
|
|
Loading…
Reference in a new issue