# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andy@andybev.com-20100731150544-p9g5vwcakwomkug9 # target_branch: file:///home/andrew/squid-repo/trunk/ # testament_sha1: acdd91fe4f43f7f08ff31f224b583c5310f8398c # timestamp: 2010-07-31 16:09:55 +0100 # base_revision_id: squid3@treenet.co.nz-20100731141830-\ # 60bm8quxdd78f5rz # # Begin patch === modified file 'configure.in' --- configure.in 2010-07-31 14:18:30 +0000 +++ configure.in 2010-07-31 15:05:44 +0000 @@ -1377,7 +1377,7 @@ CXXFLAGS="`getconf ${buildmodel}_CFLAGS` $CXXFLAGS" LIBS="`getconf ${buildmodel}_LIBS` $LIBS" LDFLAGS="`getconf ${buildmodel}_LDFLAGS` $LDFLAGS" - if "$squid_host_os" = "solaris" ; then + if test "$squid_host_os" = "solaris" ; then # On Solaris getconf returns for CFLAGS -xarch=generic64, -Xa and -Usun options, and # for LDFLAGS -xarch=generic64, but: # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVwW+3YAAWhfgAAwVGP//3MD nAC/7//wUAM68OdOOl05BKJJgo8TTI1PKbSepmIJmiep6jNQ0CUSp+mCZAKfqmmgAAAAABKmRHqp hPDRNPUamgAAwExAGAAAAAAAAAAASU0mE0AVHtKeTRPU9MoaHqPUYmmRomLHLYm26KFzD6MmECxn vR628b8FfqyIhTrc0J0dQisY73X9vd98HLx3FUweiaLHK/socvjooqnRpUGQLoeP4MRSKwq06jyv FpFoB/kti3hfSdVkyCLx264GYRnwENB53HWS8h4oZCH0g5TUwfB9BaniPr5m7hMQz7iUZPpliWLo YK8PS2jxRkc8g48yJTln7dZpIRYTHFxoX1M7P0Jl+GoIhDVGhdEeGDY8RESkXzW8rk9LWqEMqLgi OIKiY3iXdOp+STUhPWyQscC1vEZjhHENsFK2iScrGzNy/aDdOgSiShUqD6ZkI58tClsrYOWeI4sJ ErB7BXgV0zVqLSVMX0w4RlgUfgSZdLexvMXsljMiZoawqS2GFgsTGmhpMmTpdJhviTnEVivjKzFq 2XMGsRXK0eA561OoXZofh1q0urp5akSYOtT0KiqvzE1i12c6rkcxu/GEb+bPLCgzpcwbJ2gp51ax 9+4GhLoIMmmkjFm7YonKJDc8m/gS22ldiJbuDLaHGcbY8YCdDvxYummZeaIb4qaV9R7Nv7ctdqOI 0kwSW0frxJBkVnqFXvJR72Et/ancsejCDXINV6I9qs8Hw3bJdneaBeEgNkssNi34sIhQeMEVPSHP U3TTO2KuULUT28UMiUOOzuyBKarGyQpHiJOVe17iYxQXzFxRNWGgSz7vvanmGoutDwkmaPnuPYJ5 H3dwDnhV+XRmgFXSF5+w0ZbxMgTjs46QMDKH26lbG7ZKIth2A1k1PKhrhECEC2LnKoIwHh+2EqoA 5VKj0M5OXuDZmFuTJdYnEQ4MoG0JLgxK8l2d4mWaqmwNhVuCHGGmiPCr0uCxCGqZwRwcySQbRrQ7 wqx19k8VIteDHJb4OD9i9SSjUI0XlaD2fzHOsxR2OjXsoTRWvAHVOVuHIXqjdPonhkloVpkMJ3IW NYtoWwC5fovEqBnUoudH/i7kinChILgt9uw=