------------------------------------------------------------
revno: 11682
revision-id: squid3@treenet.co.nz-20121017002030-ggwk1tlogiuk159p
parent: squid3@treenet.co.nz-20121017001833-ihu1rb7pz4kii4z4
author: Henrik Nordstrom <hno@squid-cache.org>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.2
timestamp: Tue 2012-10-16 18:20:30 -0600
message:
  Correct --enable-build-info on out-of-tree builds
  
  bzr expects to be run from the source tree, not the build directory
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121017002030-ggwk1tlogiuk159p
# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# testament_sha1: 11a291157db3885d7ffe05a8d0fc27f7d741e8d1
# timestamp: 2012-10-17 00:44:18 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# base_revision_id: squid3@treenet.co.nz-20121017001833-\
#   ihu1rb7pz4kii4z4
# 
# Begin patch
=== modified file 'acinclude/squid-util.m4'
--- acinclude/squid-util.m4	2012-06-04 10:27:26 +0000
+++ acinclude/squid-util.m4	2012-10-17 00:20:30 +0000
@@ -196,12 +196,12 @@
     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