From 969a14599d2f7bfd02971475b5b2be49fb965117 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 13 Apr 2012 14:41:33 +0200
Subject: If "pv" is available at compile time, hard-code its path

---
 configure.ac                | 1 +
 scripts/nix-copy-closure.in | 2 +-
 substitute.mk               | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c37f76870c..fba53e8160 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,7 @@ NEED_PROG(bzip2, bzip2)
 AC_PATH_PROG(dot, dot)
 AC_PATH_PROG(dblatex, dblatex)
 AC_PATH_PROG(gzip, gzip)
+AC_PATH_PROG(pv, pv, pv)
 
 
 # Test that Perl has the open/fork feature (Perl 5.8.0 and beyond).
diff --git a/scripts/nix-copy-closure.in b/scripts/nix-copy-closure.in
index ca240d3ee5..12a83cff97 100755
--- a/scripts/nix-copy-closure.in
+++ b/scripts/nix-copy-closure.in
@@ -63,7 +63,7 @@ while (@ARGV) {
         $includeOutputs = 1;
     }
     elsif ($arg eq "--show-progress") {
-        $progressViewer = "pv";
+        $progressViewer = "@pv@";
     }
     elsif ($arg eq "--dry-run") {
         $dryRun = 1;
diff --git a/substitute.mk b/substitute.mk
index 9009b42494..d28b330a67 100644
--- a/substitute.mk
+++ b/substitute.mk
@@ -22,6 +22,7 @@
 	 -e "s^@sed\@^$(sed)^g" \
 	 -e "s^@tar\@^$(tar)^g" \
 	 -e "s^@gzip\@^$(gzip)^g" \
+	 -e "s^@pv\@^$(pv)^g" \
 	 -e "s^@tr\@^$(tr)^g" \
 	 -e "s^@dot\@^$(dot)^g" \
 	 -e "s^@xmllint\@^$(xmllint)^g" \
-- 
cgit 1.4.1