From cd48eae560c76f93cec6cf3db7c8cd788b929a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 9 Dec 2015 19:22:08 +0100 Subject: [PATCH] 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. --- config-daemon.ac | 8 -------- 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)])],