From bb06d60058ab36d532bb72b7e2bd9b771e379e92 Mon Sep 17 00:00:00 2001
From: Henrik Nordstrom <hno@squid-cache.org>
Date: Tue, 16 Oct 2012 18:20:30 -0600
Subject: [PATCH] Correct --enable-build-info on out-of-tree builds

bzr expects to be run from the source tree, not the build directory
---
 acinclude/squid-util.m4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/acinclude/squid-util.m4 b/acinclude/squid-util.m4
index 721a81ead5..cc7569724a 100644
--- a/acinclude/squid-util.m4
+++ b/acinclude/squid-util.m4
@@ -196,12 +196,12 @@ AC_DEFUN([SQUID_EMBED_BUILD_INFO],[
     yes)
       if test -d "${srcdir}/.bzr"; then
         AC_PATH_PROG(BZR,bzr,$FALSE)
-        squid_bzr_branch_nick=`${BZR} nick 2>/dev/null`
+        squid_bzr_branch_nick=`cd ${srcdir} && ${BZR} nick 2>/dev/null`
         if test $? -eq 0 -a "x$squid_bzr_branch_nick" != "x"; then
-          squid_bzr_branch_revno=`${BZR} revno 2>/dev/null | sed 's/\"//g'`
+          squid_bzr_branch_revno=`cd ${srcdir} && ${BZR} revno 2>/dev/null | sed 's/\"//g'`
         fi
         if test $? -eq 0 -a "x$squid_bzr_branch_revno" != "x"; then
-          ${BZR} diff 2>&1 >/dev/null
+          sh -c "cd ${srcdir} && ${BZR} diff 2>&1 >/dev/null"
           if test $? -eq 1; then
               squid_bzr_branch_revno="$squid_bzr_branch_revno+changes"
           fi
-- 
2.47.2