You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2012/07/19 00:21:45 UTC
git commit: TS-895 Fix checks against short version strings (2 fields)
Updated Branches:
refs/heads/master 73b68e4a0 -> 0a0d00247
TS-895 Fix checks against short version strings (2 fields)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0a0d0024
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0a0d0024
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0a0d0024
Branch: refs/heads/master
Commit: 0a0d002471280b6bb397c3faef478fd6248d387d
Parents: 73b68e4
Author: Alan M. Carroll <am...@network-geographics.com>
Authored: Wed Jul 18 17:21:18 2012 -0500
Committer: Alan M. Carroll <am...@network-geographics.com>
Committed: Wed Jul 18 17:21:18 2012 -0500
----------------------------------------------------------------------
configure.ac | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0a0d0024/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 338de6e..2a3b8d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -528,8 +528,8 @@ 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]]*\)[[.]]\([[0-9][0-9]]*\).*$/\1 \2 \3/p' | \
- awk "{ if (\\$1 > $BISON_MAJOR || (\\$1 == $BISON_MAJOR && (\\$2 > $BISON_MINOR || (\\$2 == $BISON_MINOR && \\$3 >= $BISON_POINT)))) print \"yes\"; else printf(\"version %d.%d.%d\",\\$1,\\$2,\\$3); }" \
+ sed -n '/bison/s/^[[^0-9]]*\([[0-9][0-9]]*[[.]][[0-9][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"],
[YACC='']
@@ -544,8 +544,8 @@ FLEX_POINT=33
AC_CHECK_PROG([LEX],[flex],[flex])
AS_IF([test -n "$LEX"],
[ flex_version_check=`$LEX --version 2>&1 | \
- sed -n '/flex/s/^.*\([[0-9][0-9]]*\)[[.]]\([[0-9][0-9]]*\)[[.]]\([[0-9][0-9]]*\).*$/\1 \2 \3/p' | \
- awk "{ if (\\$1 > $FLEX_MAJOR || (\\$1 == $FLEX_MAJOR && (\\$2 > $FLEX_MINOR || (\\$2 == $FLEX_MINOR && \\$3 >= $FLEX_POINT)))) print \"yes\"; else printf(\"version %d.%d.%d\",\\$1,\\$2,\\$3); }" \
+ sed -n '/flex/s/^[[^0-9]]*\([[0-9][0-9]]*[[.]][[0-9][0-9]]*\([[.]][[0-9][0-9]]*\)\?\).*$/\1/p' | \
+ 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='']
@@ -553,6 +553,7 @@ AS_IF([test -n "$LEX"],
],
[LEX='']
)
+
AS_IF([test "x$enable_wccp" = "xyes"],
[
AS_IF([test -z "$LEX" ],