src/patches/squid-3.4-13230.patch

   1 ------------------------------------------------------------
   2 revno: 13230
   3 revision-id: squid3@treenet.co.nz-20160212045316-zwx4r9we4gf27rx3
   4 parent: squid3@treenet.co.nz-20151119051038-vwclso11p68sgvxc
   5 fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4431
   6 author: Marcos Mello <marcosfrm@gmail.com>
   7 committer: Amos Jeffries <squid3@treenet.co.nz>
   8 branch nick: 3.4
   9 timestamp: Fri 2016-02-12 17:53:16 +1300
  10 message:
  11   Bug 4431: C code is not compiled with CFLAGS
  12 ------------------------------------------------------------
  13 # Bazaar merge directive format 2 (Bazaar 0.90)
  14 # revision_id: squid3@treenet.co.nz-20160212045316-zwx4r9we4gf27rx3
  15 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
  16 # testament_sha1: 53c8d70db04dad826815fb86995cda7e99f1d8e2
  17 # timestamp: 2016-02-12 05:50:53 +0000
  18 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
  19 # base_revision_id: squid3@treenet.co.nz-20151119051038-\
  20 #   vwclso11p68sgvxc
  21 #
  22 # Begin patch
  23 === modified file 'acinclude/compiler-flags.m4'
  24 --- acinclude/compiler-flags.m4 2015-01-09 10:30:44 +0000
  25 +++ acinclude/compiler-flags.m4 2016-02-12 04:53:16 +0000
  26 @@ -36,7 +36,7 @@
  27    AC_CACHE_CHECK([whether compiler accepts $2],[$1],
  28    [{
  29      AC_REQUIRE([AC_PROG_CC])
  30 -    SAVED_FLAGS="$CFLAGS"
  31 +    SAVED_CFLAGS="$CFLAGS"
  32      SAVED_CXXFLAGS="$CXXFLAGS"
  33      CFLAGS="$CFLAGS $2"
  34      CXXFLAGS="$CXXFLAGS $2"
  35 @@ -60,7 +60,7 @@
  36    AC_CACHE_CHECK([whether compiler requires $2],[$1],
  37    [{
  38      AC_REQUIRE([AC_PROG_CC])
  39 -    SAVED_FLAGS="$CFLAGS"
  40 +    SAVED_CFLAGS="$CFLAGS"
  41      SAVED_CXXFLAGS="$CXXFLAGS"
  42      AC_COMPILE_IFELSE([AC_LANG_PROGRAM($3,$4)],[$1=no],[],[$1=no])
  43      if test "x$1" != "xno" ; then
  44