summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac13
2 files changed, 0 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index e0ee65fccee..aec2bb1474e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -722,7 +722,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
722 --localstatedir="$$dc_install_base/var" \ 722 --localstatedir="$$dc_install_base/var" \
723 --with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)" \ 723 --with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)" \
724 --with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)" \ 724 --with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)" \
725 --with-nix-prefix="$(NIX_PREFIX)" \
726 --enable-daemon \ 725 --enable-daemon \
727 ac_cv_guix_test_root="$(GUIX_TEST_ROOT)" 726 ac_cv_guix_test_root="$(GUIX_TEST_ROOT)"
728 727
diff --git a/configure.ac b/configure.ac
index afb449950ff..aa97f67ebee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,19 +194,6 @@ AC_SUBST([GZIP])
194AC_SUBST([BZIP2]) 194AC_SUBST([BZIP2])
195AC_SUBST([XZ]) 195AC_SUBST([XZ])
196 196
197AC_ARG_WITH([nix-prefix],
198 [AS_HELP_STRING([--with-nix-prefix=DIR],
199 [search for Nix in DIR (for testing purposes and '--disable-daemon' builds)])],
200 [case "$withval" in
201 yes|no) ;;
202 *)
203 NIX_PREFIX="$withval"
204 PATH="$NIX_PREFIX/bin:$PATH"; export PATH
205 AC_SUBST([NIX_PREFIX])
206 ;;
207 esac],
208 [])
209
210AC_ARG_WITH([nixpkgs], 197AC_ARG_WITH([nixpkgs],
211 [AS_HELP_STRING([--with-nixpkgs=DIR], 198 [AS_HELP_STRING([--with-nixpkgs=DIR],
212 [search for Nixpkgs in DIR (for testing purposes only)])], 199 [search for Nixpkgs in DIR (for testing purposes only)])],