summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-12-23 23:59:26 +0100
committerLudovic Courtès <ludo@gnu.org>2020-12-27 17:12:06 +0100
commita016a451c41486d8f8277742d47157cc2597d5bc (patch)
tree195557e6c28f4594e55a09a12c2c3f259c2065db
parentbe0a06ec41319a093b206a858ea16926c1f3f35f (diff)
maint: Remove unused '--with-nix-prefix' configure option.
* configure.ac: Remove '--with-nix-prefix' and 'NIX_PREFIX' variable. * Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Remove '--with-nix-prefix'.
-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 e0ee65fcce..aec2bb1474 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -722,7 +722,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
--localstatedir="$$dc_install_base/var" \
--with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)" \
--with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)" \
- --with-nix-prefix="$(NIX_PREFIX)" \
--enable-daemon \
ac_cv_guix_test_root="$(GUIX_TEST_ROOT)"
diff --git a/configure.ac b/configure.ac
index afb449950f..aa97f67ebe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,19 +194,6 @@ 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)])],
- [case "$withval" in
- yes|no) ;;
- *)
- NIX_PREFIX="$withval"
- PATH="$NIX_PREFIX/bin:$PATH"; export PATH
- AC_SUBST([NIX_PREFIX])
- ;;
- esac],
- [])
-
AC_ARG_WITH([nixpkgs],
[AS_HELP_STRING([--with-nixpkgs=DIR],
[search for Nixpkgs in DIR (for testing purposes only)])],