Updated Branches: refs/heads/master 758d8657b -> c7b08685c
Tweaks for better WCCP support on Ubuntu. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c7b08685 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c7b08685 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c7b08685 Branch: refs/heads/master Commit: c7b08685c17ab02e4b99107e282b009418f431be Parents: 758d865 Author: Alan M. Carroll <amc@ubuntu.(none)> Authored: Tue Jul 24 10:35:29 2012 -0700 Committer: Alan M. Carroll <amc@ubuntu.(none)> Committed: Tue Jul 24 10:35:29 2012 -0700 ---------------------------------------------------------------------- configure.ac | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c7b08685/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 9b3aa77..50c3aa6 100644 --- a/configure.ac +++ b/configure.ac @@ -546,10 +546,16 @@ AS_IF([test -n "$YACC"], $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"], - [YACC=''] + [ YACC='' + AS_IF([test -z "$bison_version_check"], + [bison_version_check='no version data'] + ) + ] ) ], - [YACC=''] + [ YACC='' + bison_version_check="nothing" + ] ) # Check lex/flex by hand because we need flex of a sufficient version. FLEX_MAJOR=2 @@ -564,10 +570,16 @@ AS_IF([test -n "$LEX"], $AWK "{ if (\\$1 > $FLEX_MAJOR || (\\$1 == $FLEX_MAJOR && (\\$2 > $FLEX_MINOR || (\\$2 == $FLEX_MINOR && (NR == 2 || \\$3 >= $FLEX_POINT))))) print \"yes\"; else printf(\"version %d.%d.%d\",\\$1,\\$2,\\$3); }" FS=. \ ` AS_IF([test "x$flex_version_check" != "xyes"], - [LEX=''] + [ LEX='' + AS_IF([test -z "$flex_version_check"], + [flex_version_check='no version data'] + ) + ] ) ], - [LEX=''] + [ LEX='' + flex_version_check="nothing" + ] ) AS_IF([test "x$enable_wccp" = "xyes"],
