From: Henrik Nordstrom <hno@squid-cache.org>
Date: Thu, 11 Oct 2012 21:14:50 +0000 (+0200)
Subject: Correct --enable-build-info on out-of-tree builds
X-Git-Tag: SQUID_3_4_0_1~575
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa73ca74a8353561d02319f1932f29c7ea0a42e6;p=thirdparty%2Fsquid.git

Correct --enable-build-info on out-of-tree builds

bzr expects to be run from the source tree, not the build directory
---

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