summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorVsevolod Kvachev <rasielll@gmail.com>2018-04-19 23:04:37 +0300
committerVsevolod Kvachev <rasielll@gmail.com>2018-04-19 23:04:37 +0300
commit5f6012039abb6ec9e9dfea801effa6b02fd102bc (patch)
tree056eb0d0d85c6cd554fe911dd15756e9ca5ac794 /configure.ac
parent2ab3f4d744682d6512e216f57e0fb7cecea04169 (diff)
downloadswig-5f6012039abb6ec9e9dfea801effa6b02fd102bc.tar.gz
Fix go version matching in configure for go1.10
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac10
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 833cb37bf..ba1631743 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2584,7 +2584,7 @@ else
GOVERSIONOPTION=version
go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
case "$go_version" in
- go1 | go1.[[01234]]*)
+ go1 | go1.[[01234]] | go1.[[01234]].*)
GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
;;
*)
@@ -2593,7 +2593,7 @@ else
esac
AC_MSG_CHECKING([whether go version is too old])
case $go_version in
- go1.1* | go1.0* | go1 )
+ go1.1.* | go1.1 | go1.0 | go1.0.* | go1 )
AC_MSG_RESULT([yes - minimum version is 1.2])
GO=
GOOPT="-intgosize 32"
@@ -2611,13 +2611,13 @@ else
;;
esac
case $go_version in
- go1.0* | go1 | go1.1*)
+ go1.0 | go1.0.* | go1 | go1.1 | go1.1.*)
GOOPT="$GOOPT -use-shlib"
;;
- go1.2*)
+ go1.2 | go1.2.*)
GO12=true
;;
- go1.3* | go1.4*)
+ go1.3 | go1.3.* | go1.4 | go1.4.*)
GO13=true
;;
*)