------------------------------------------------------------ revno: 12360 revision-id: squid3@treenet.co.nz-20121013060514-fne82qji4y4ok895 parent: squid3@treenet.co.nz-20121013060300-3lu195j7wi6ugw5i author: Henrik Nordstrom committer: Amos Jeffries branch nick: 3.3 timestamp: Sat 2012-10-13 00:05:14 -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-20121013060514-fne82qji4y4ok895 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 414e202ccb591382a8fe66b1764be90a9da8f745 # timestamp: 2012-10-13 06:07:45 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20121013060300-\ # 3lu195j7wi6ugw5i # # Begin patch === modified file 'acinclude/squid-util.m4' --- acinclude/squid-util.m4 2012-05-29 09:34:10 +0000 +++ acinclude/squid-util.m4 2012-10-13 06:05:14 +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