diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-12-09 19:22:08 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-12-09 22:18:47 +0100 |
| commit | cd48eae560c76f93cec6cf3db7c8cd788b929a69 (patch) | |
| tree | 8630465ef867f96bd3c30957a31d70254aa57d05 | |
| parent | 6b6a0b143d487befb115bcbcb54de862c508f4f6 (diff) | |
| download | patches-cd48eae560c76f93cec6cf3db7c8cd788b929a69.tar patches-cd48eae560c76f93cec6cf3db7c8cd788b929a69.tar.gz | |
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.
| -rw-r--r-- | config-daemon.ac | 8 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/config-daemon.ac b/config-daemon.ac index 8c1c776133..c74ec94d31 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -14,14 +14,6 @@ if test "x$guix_build_daemon" = "xyes"; then AC_PROG_RANLIB 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. AC_SYS_LARGEFILE diff --git a/configure.ac b/configure.ac index 00e7c7b4bc..19efd08e64 100644 --- a/configure.ac +++ b/configure.ac @@ -90,6 +90,14 @@ GUIX_CHECK_LIBC_MOUNT AM_CONDITIONAL([BUILD_SYSCALLS_MODULE], [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], [AS_HELP_STRING([--with-nix-prefix=DIR], [search for Nix in DIR (for testing purposes and '--disable-daemon' builds)])], |