819d24
From 5f6012039abb6ec9e9dfea801effa6b02fd102bc Mon Sep 17 00:00:00 2001
819d24
From: Vsevolod Kvachev <rasielll@gmail.com>
819d24
Date: Thu, 19 Apr 2018 23:04:37 +0300
819d24
Subject: [PATCH] Fix go version matching in configure for go1.10
819d24
819d24
---
819d24
 configure.ac | 10 +++++-----
819d24
 1 file changed, 5 insertions(+), 5 deletions(-)
819d24
819d24
diff --git a/configure.ac b/configure.ac
819d24
index 833cb37bf..ba1631743 100644
819d24
--- a/configure.ac
819d24
+++ b/configure.ac
819d24
@@ -2597,7 +2597,7 @@ else
819d24
     GOVERSIONOPTION=version
819d24
     go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
819d24
     case "$go_version" in
819d24
-    go1 | go1.[[01234]]*)
819d24
+    go1 | go1.[[01234]] | go1.[[01234]].*)
819d24
       GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
819d24
       ;;
819d24
     *)
819d24
@@ -2606,7 +2606,7 @@ else
819d24
     esac
819d24
     AC_MSG_CHECKING([whether go version is too old])
819d24
     case $go_version in
819d24
-    go1.1* | go1.0* | go1 )
819d24
+    go1.1.* | go1.1 | go1.0 | go1.0.* | go1 )
819d24
       AC_MSG_RESULT([yes - minimum version is 1.2])
819d24
       GO=
819d24
       GOOPT="-intgosize 32"
819d24
@@ -2624,13 +2624,13 @@ else
819d24
       ;;
819d24
     esac
819d24
     case $go_version in
819d24
-    go1.0* | go1 | go1.1*)
819d24
+    go1.0 | go1.0.* | go1 | go1.1 | go1.1.*)
819d24
       GOOPT="$GOOPT -use-shlib"
819d24
       ;;
819d24
-    go1.2*)
819d24
+    go1.2 | go1.2.*)
819d24
       GO12=true
819d24
       ;;
819d24
-    go1.3* | go1.4*)
819d24
+    go1.3 | go1.3.* | go1.4 | go1.4.*)
819d24
       GO13=true
819d24
       ;;
819d24
     *)
819d24
-- 
819d24
2.14.3
819d24