From c217708f7bf6a0fc6a77864134ac68091dc24327 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 19 Jan 2013 23:09:36 +0100
Subject: build: Use "nix-instantiate" as the default name for that program.

* configure.ac: Have `NIX_INSTANTIATE' default to `nix-instantiate'.
---
 configure.ac | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/configure.ac b/configure.ac
index 8c71016782..cbca81a3cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,12 @@ if test "x$guix_build_daemon$NIX_INSTANTIATE$NIX_HASH" = "xno"; then
    AC_MSG_ERROR([Nix programs not found; please install Nix or use `--with-nix-prefix'.])
 fi
 
+if test "x$NIX_INSTANTIATE" = "x"; then
+   # This program is an optional dependency, so we just want it to be
+   # taken from $PATH if it's not available right now.
+   NIX_INSTANTIATE="nix-instantiate"
+fi
+
 AC_ARG_WITH([nixpkgs],
   [AS_HELP_STRING([--with-nixpkgs=DIR], [search for Nixpkgs in DIR])],
   [case "$withval" in
-- 
cgit 1.4.1