Updated Branches: refs/heads/master 1913c9211 -> d48c4be09
TS-2252: Fix bison version check on Ubuntu. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d48c4be0 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d48c4be0 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d48c4be0 Branch: refs/heads/master Commit: d48c4be099cbb3b82734750e52dfff6084272771 Parents: 1913c92 Author: Alan M. Carroll <a...@network-geographics.com> Authored: Wed Nov 6 16:51:03 2013 -0600 Committer: Alan M. Carroll <a...@network-geographics.com> Committed: Wed Nov 6 16:51:03 2013 -0600 ---------------------------------------------------------------------- CHANGES | 2 ++ configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d48c4be0/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index d48ba8f..1562ec4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 4.1.0 + *) [TS-2252] Fix bison version check on Ubuntu. + *) [TS-2108] Fix TSConfig to build with bison 3.0 *) [TS-2311] ESI: Support responses that are of other text content type as well as non-200 status response. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d48c4be0/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index db2ac63..5184aca 100644 --- a/configure.ac +++ b/configure.ac @@ -677,7 +677,7 @@ BISON_POINT=1 AC_CHECK_PROG([YACC],[bison],[bison]) AS_IF([test -n "$YACC"], [ bison_version_check=`$YACC --version 2>&1 | \ - $SED -n '/bison/s/^[[^0-9]]*\([[0-9]][[0-9.]]*\)[[^0-9]]*$/\1/p' | \ + $SED -n '/bison/s/^[[^0-9]]*\([[0-9]][[0-9.]]*\).*$/\1/p' | \ $AWK "{ if (\\$1 > $BISON_MAJOR || (\\$1 == $BISON_MAJOR && (\\$2 > $BISON_MINOR || (\\$2 == $BISON_MINOR && (NR == 2 || \\$3 >= $BISON_POINT))))) print \"yes\"; else printf(\"version %d.%d.%d\",\\$1,\\$2,\\$3); }" FS=. \ ` AS_IF([test "x$bison_version_check" != "xyes"], @@ -779,7 +779,7 @@ case $host_os_def in # 1720 is "operator new" has no corresponding member operator delete" # 2256 is "non-pointer conversion from "int" to "unsigned char" " # 2259 is "non-pointer conversion from "int" to "unsigned char" " - # + # # TODO: We should try to eliminate more of these -wd exclusions. common_opt="-pipe -Wall -wd111 -wd279 -wd383 -wd522 -wd444 -wd873 -wd981 -wd1418 -wd1419 -wd1572 -wd1720 -wd2256 -wd2259" debug_opt="-ggdb3 $common_opt"
